diff -Naur Cynthiune-0.9.5.orig/Bundles/aRts/GNUmakefile Cynthiune-0.9.5/Bundles/aRts/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/aRts/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/aRts/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=aRts
 BUNDLE_NAME=aRts
 BUNDLE_EXTENSION=.output
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 aRts_PRINCIPAL_CLASS=aRts
 aRts_LANGUAGES=
 aRts_LOCALIZED_RESOURCE_FILES=
diff -Naur Cynthiune-0.9.5.orig/Bundles/ASFTags/GNUmakefile Cynthiune-0.9.5/Bundles/ASFTags/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/ASFTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/ASFTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=ASFTags
 BUNDLE_NAME=ASFTags
 BUNDLE_EXTENSION=.tags
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 ASFTags_PRINCIPAL_CLASS=ASFTags
 
 #
diff -Naur Cynthiune-0.9.5.orig/Bundles/AudioFile/GNUmakefile Cynthiune-0.9.5/Bundles/AudioFile/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/AudioFile/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/AudioFile/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -24,7 +24,7 @@
 PACKAGE_NAME=AudioFile
 BUNDLE_NAME=AudioFile
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 AudioFile_PRINCIPAL_CLASS=AudioFile
 
 AudioFile_LIBRARIES_DEPEND_UPON += 
diff -Naur Cynthiune-0.9.5.orig/Bundles/Esound/GNUmakefile Cynthiune-0.9.5/Bundles/Esound/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/Esound/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/Esound/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=Esound
 BUNDLE_NAME=Esound
 BUNDLE_EXTENSION=.output
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 Esound_PRINCIPAL_CLASS=Esound
 Esound_LANGUAGES=English French
 Esound_LOCALIZED_RESOURCE_FILES=Localizable.strings
diff -Naur Cynthiune-0.9.5.orig/Bundles/FLAC/GNUmakefile Cynthiune-0.9.5/Bundles/FLAC/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/FLAC/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/FLAC/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=FLAC
 BUNDLE_NAME=FLAC
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 FLAC_PRINCIPAL_CLASS=FLAC
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/FLACTags/GNUmakefile Cynthiune-0.9.5/Bundles/FLACTags/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/FLACTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/FLACTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=FLACTags
 BUNDLE_NAME=FLACTags
 BUNDLE_EXTENSION=.tags
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 FLACTags_PRINCIPAL_CLASS=FLACTags
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/FormatSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/FormatSkeleton/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/FormatSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/FormatSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=$FORMAT$
 BUNDLE_NAME=$FORMAT$
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 $FORMAT$_PRINCIPAL_CLASS=$FORMAT$
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/GraphWriter/GNUmakefile Cynthiune-0.9.5/Bundles/GraphWriter/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/GraphWriter/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/GraphWriter/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=GraphWriter
 BUNDLE_NAME=GraphWriter
 BUNDLE_EXTENSION=.output
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 GraphWriter_PRINCIPAL_CLASS=GraphWriter
 GraphWriter_LANGUAGES=
 GraphWriter_LOCALIZED_RESOURCE_FILES=
diff -Naur Cynthiune-0.9.5.orig/Bundles/ID3Tag/GNUmakefile Cynthiune-0.9.5/Bundles/ID3Tag/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/ID3Tag/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/ID3Tag/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=ID3Tag
 BUNDLE_NAME=ID3Tag
 BUNDLE_EXTENSION=.tags
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 ID3Tag_PRINCIPAL_CLASS=ID3Tag
 
 #
diff -Naur Cynthiune-0.9.5.orig/Bundles/Mod/GNUmakefile Cynthiune-0.9.5/Bundles/Mod/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/Mod/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/Mod/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=Mod
 BUNDLE_NAME=Mod
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 Mod_PRINCIPAL_CLASS=Mod
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/MP3/GNUmakefile Cynthiune-0.9.5/Bundles/MP3/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/MP3/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/MP3/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=MP3
 BUNDLE_NAME=MP3
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 MP3_PRINCIPAL_CLASS=MP3
 
 #
diff -Naur Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -28,7 +28,7 @@
 PACKAGE_NAME=Musepack
 BUNDLE_NAME=Musepack
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 Musepack_PRINCIPAL_CLASS=Musepack
 
 #
diff -Naur Cynthiune-0.9.5.orig/Bundles/Ogg/GNUmakefile Cynthiune-0.9.5/Bundles/Ogg/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/Ogg/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/Ogg/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=Ogg
 BUNDLE_NAME=Ogg
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 Ogg_PRINCIPAL_CLASS=Ogg
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/OSS/GNUmakefile Cynthiune-0.9.5/Bundles/OSS/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/OSS/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/OSS/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=OSS
 BUNDLE_NAME=OSS
 BUNDLE_EXTENSION=.output
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 OSS_PRINCIPAL_CLASS=OSS
 OSS_LANGUAGES=English French
 OSS_LOCALIZED_RESOURCE_FILES=Localizable.strings
diff -Naur Cynthiune-0.9.5.orig/Bundles/OutputSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/OutputSkeleton/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/OutputSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/OutputSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=$OUTPUT$
 BUNDLE_NAME=$OUTPUT$
 BUNDLE_EXTENSION=.output
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 $OUTPUT$_PRINCIPAL_CLASS=$OUTPUT$
 $OUTPUT$_LANGUAGES=
 $OUTPUT$_LOCALIZED_RESOURCE_FILES=
diff -Naur Cynthiune-0.9.5.orig/Bundles/Taglib/GNUmakefile Cynthiune-0.9.5/Bundles/Taglib/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/Taglib/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/Taglib/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=Taglib
 BUNDLE_NAME=Taglib
 BUNDLE_EXTENSION=.tags
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 Taglib_PRINCIPAL_CLASS=Taglib
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/TagsSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/TagsSkeleton/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/TagsSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/TagsSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=$TAGS$
 BUNDLE_NAME=$TAGS$
 BUNDLE_EXTENSION=.tags
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 $TAGS$_PRINCIPAL_CLASS=$TAGS$
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/Timidity/GNUmakefile Cynthiune-0.9.5/Bundles/Timidity/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/Timidity/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/Timidity/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=Timidity
 BUNDLE_NAME=Timidity
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 Timidity_PRINCIPAL_CLASS=Timidity
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/VorbisTags/GNUmakefile Cynthiune-0.9.5/Bundles/VorbisTags/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/VorbisTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/VorbisTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=VorbisTags
 BUNDLE_NAME=VorbisTags
 BUNDLE_EXTENSION=.tags
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 VorbisTags_PRINCIPAL_CLASS=VorbisTags
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/WaveOut/GNUmakefile Cynthiune-0.9.5/Bundles/WaveOut/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/WaveOut/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/WaveOut/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=WaveOut
 BUNDLE_NAME=WaveOut
 BUNDLE_EXTENSION=.output
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 WaveOut_PRINCIPAL_CLASS=WaveOut
 WaveOut_LANGUAGES=
 WaveOut_LOCALIZED_RESOURCE_FILES=
diff -Naur Cynthiune-0.9.5.orig/Bundles/WindowsMedia/GNUmakefile Cynthiune-0.9.5/Bundles/WindowsMedia/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/WindowsMedia/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/WindowsMedia/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=WindowsMedia
 BUNDLE_NAME=WindowsMedia
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 WindowsMedia_PRINCIPAL_CLASS=WindowsMedia
 
 
diff -Naur Cynthiune-0.9.5.orig/Bundles/XMMSInput/GNUmakefile Cynthiune-0.9.5/Bundles/XMMSInput/GNUmakefile
--- Cynthiune-0.9.5.orig/Bundles/XMMSInput/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/Bundles/XMMSInput/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
@@ -35,7 +35,7 @@
 PACKAGE_NAME=XMMSInput
 BUNDLE_NAME=XMMSInput
 BUNDLE_EXTENSION=.format
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
 XMMSInput_PRINCIPAL_CLASS=XMMSInput
 
 
diff -Naur Cynthiune-0.9.5.orig/GNUmakefile Cynthiune-0.9.5/GNUmakefile
--- Cynthiune-0.9.5.orig/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
+++ Cynthiune-0.9.5/GNUmakefile	2007-07-01 23:34:07.000000000 +0200
@@ -22,8 +22,6 @@
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)/
-
 FRAMEWORKS_DIRS = Frameworks/Cynthiune
 FRAMEWORKS = Cynthiune