Index: Backbone.make
===================================================================
RCS file: /sources/backbone/System/Backbone.make,v
retrieving revision 1.2
diff -u -r1.2 Backbone.make
--- Backbone.make	4 Sep 2006 12:35:21 -0000	1.2
+++ Backbone.make	2 May 2007 02:31:48 -0000
@@ -10,7 +10,7 @@
 define FRAMEWORK_link
 fw := $(1)
 AUXILIARY_OBJC_LIBS += -l$(fw)
-AUXILIARY_LIB_DIRS += -L$(BBFRAMEWORKS)/$(fw)/$(fw).framework/Versions/Current/$(GNUSTEP_LDIR)
+AUXILIARY_LIB_DIRS += -L$(BBFRAMEWORKS)/$(fw)/$(fw).framework/$(GNUSTEP_TARGET_LDIR)
 endef
 
 $(foreach fw,$(FRAMEWORKS), $(eval $(call FRAMEWORK_link, $(fw))))
Index: Applications/Preferences/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/GNUmakefile.preamble,v
retrieving revision 1.5
diff -u -r1.5 GNUmakefile.preamble
--- Applications/Preferences/GNUmakefile.preamble	4 Sep 2006 12:35:22 -0000	1.5
+++ Applications/Preferences/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -34,14 +34,9 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS += \
-	$(GNUSTEP_USER_ROOT)/Library/Preferences \
-	$(GNUSTEP_LOCAL_ROOT)/Library/Preferences \
-	$(GNUSTEP_NETWORK_ROOT)/Library/Preferences \
-	$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
+	$(GNUSTEP_USER_LIBRARY)/Preferences \
+	$(GNUSTEP_LOCAL_LIBRARY)/Preferences \
+	$(GNUSTEP_NETWORK_LIBRARY)/Preferences \
+	$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
Index: Applications/Preferences/Modules/Colors/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Colors/GNUmakefile,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile
--- Applications/Preferences/Modules/Colors/GNUmakefile	3 Sep 2006 17:15:12 -0000	1.2
+++ Applications/Preferences/Modules/Colors/GNUmakefile	2 May 2007 02:31:48 -0000
@@ -3,7 +3,7 @@
 BUNDLE_NAME=		Colors
 BUNDLE_EXTENSION=	.prefs
 
-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
+BUNDLE_INSTALL_DIR=	$(GNUSTEP_LIBRARY)/Preferences
 
 FRAMEWORKS= PrefsModule
 include $(TOP_SRCDIR)/Backbone.make
Index: Applications/Preferences/Modules/Colors/GNUmakefile.postamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Colors/GNUmakefile.postamble,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.postamble
--- Applications/Preferences/Modules/Colors/GNUmakefile.postamble	3 Sep 2006 17:15:12 -0000	1.1
+++ Applications/Preferences/Modules/Colors/GNUmakefile.postamble	2 May 2007 02:31:48 -0000
@@ -9,6 +9,7 @@
   
 # Things to do after installing
 after-install::
+	$(MKINSTALLDIRS) $(GNUSTEP_LIBRARY)/Colors
 	$(INSTALL) -m644 $(wildcard *.colorScheme) $(GNUSTEP_LIBRARY)/Colors
 
 # Things to do before uninstalling
Index: Applications/Preferences/Modules/Colors/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Colors/GNUmakefile.preamble,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.preamble
--- Applications/Preferences/Modules/Colors/GNUmakefile.preamble	10 Jun 2004 22:33:55 -0000	1.1
+++ Applications/Preferences/Modules/Colors/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -31,10 +31,5 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS +=
Index: Applications/Preferences/Modules/Defaults/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Defaults/GNUmakefile,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile
--- Applications/Preferences/Modules/Defaults/GNUmakefile	16 Aug 2003 17:19:29 -0000	1.2
+++ Applications/Preferences/Modules/Defaults/GNUmakefile	2 May 2007 02:31:48 -0000
@@ -2,7 +2,7 @@
 
 BUNDLE_NAME=		Defaults
 BUNDLE_EXTENSION=	.prefs
-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
+BUNDLE_INSTALL_DIR=	$(GNUSTEP_LIBRARY)/Preferences
 
 FRAMEWORKS= PrefsModule
 include $(TOP_SRCDIR)/Backbone.make
Index: Applications/Preferences/Modules/Defaults/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Defaults/GNUmakefile.preamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.preamble
--- Applications/Preferences/Modules/Defaults/GNUmakefile.preamble	16 Aug 2003 17:35:57 -0000	1.3
+++ Applications/Preferences/Modules/Defaults/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -31,10 +31,5 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS +=
Index: Applications/Preferences/Modules/Font/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Font/GNUmakefile,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile
--- Applications/Preferences/Modules/Font/GNUmakefile	12 Oct 2005 00:02:36 -0000	1.3
+++ Applications/Preferences/Modules/Font/GNUmakefile	2 May 2007 02:31:48 -0000
@@ -3,7 +3,7 @@
 BUNDLE_NAME=		Font
 BUNDLE_EXTENSION=	.prefs
 
-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
+BUNDLE_INSTALL_DIR=	$(GNUSTEP_LIBRARY)/Preferences
 
 FRAMEWORKS= PrefsModule
 include $(TOP_SRCDIR)/Backbone.make
Index: Applications/Preferences/Modules/Font/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Font/GNUmakefile.preamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.preamble
--- Applications/Preferences/Modules/Font/GNUmakefile.preamble	16 Aug 2003 17:35:57 -0000	1.3
+++ Applications/Preferences/Modules/Font/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -31,10 +31,5 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS +=
Index: Applications/Preferences/Modules/Keyboard/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Keyboard/GNUmakefile,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile
--- Applications/Preferences/Modules/Keyboard/GNUmakefile	16 Aug 2003 17:19:29 -0000	1.3
+++ Applications/Preferences/Modules/Keyboard/GNUmakefile	2 May 2007 02:31:48 -0000
@@ -3,7 +3,7 @@
 BUNDLE_NAME=		Keyboard
 BUNDLE_EXTENSION=	.prefs
 
-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
+BUNDLE_INSTALL_DIR=	$(GNUSTEP_LIBRARY)/Preferences
 
 FRAMEWORKS= PrefsModule
 include $(TOP_SRCDIR)/Backbone.make
Index: Applications/Preferences/Modules/Keyboard/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Keyboard/GNUmakefile.preamble,v
retrieving revision 1.4
diff -u -r1.4 GNUmakefile.preamble
--- Applications/Preferences/Modules/Keyboard/GNUmakefile.preamble	16 Aug 2003 17:35:57 -0000	1.4
+++ Applications/Preferences/Modules/Keyboard/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -31,10 +31,5 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS +=
Index: Applications/Preferences/Modules/PrefsApp/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/PrefsApp/GNUmakefile.preamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.preamble
--- Applications/Preferences/Modules/PrefsApp/GNUmakefile.preamble	9 Jul 2003 19:53:55 -0000	1.3
+++ Applications/Preferences/Modules/PrefsApp/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -21,7 +21,7 @@
 # GNUstepWeb
 ADDITIONAL_GSW_LIBS +=
 # GUI apps
-ADDITIONAL_GUI_LIBS += -L$(BBFRAMEWORKS)/PrefsModule/PrefsModule.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) -lPrefsModule
+ADDITIONAL_GUI_LIBS += -L$(BBFRAMEWORKS)/PrefsModule/PrefsModule.framework/$(GNUSTEP_TARGET_LDIR) -lPrefsModule
 # Libraries
 ADDITIONAL_LIBRARY_LIBS +=
 # ObjC stuff
Index: Applications/Preferences/Modules/Time/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Time/GNUmakefile,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile
--- Applications/Preferences/Modules/Time/GNUmakefile	16 Aug 2003 17:19:29 -0000	1.2
+++ Applications/Preferences/Modules/Time/GNUmakefile	2 May 2007 02:31:48 -0000
@@ -2,7 +2,7 @@
 
 BUNDLE_NAME=		Time
 BUNDLE_EXTENSION=	.prefs
-BUNDLE_INSTALL_DIR=	$(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
+BUNDLE_INSTALL_DIR=	$(GNUSTEP_LIBRARY)/Preferences
 
 FRAMEWORKS= PrefsModule
 include $(TOP_SRCDIR)/Backbone.make
Index: Applications/Preferences/Modules/Time/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/Preferences/Modules/Time/GNUmakefile.preamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.preamble
--- Applications/Preferences/Modules/Time/GNUmakefile.preamble	16 Aug 2003 17:35:57 -0000	1.3
+++ Applications/Preferences/Modules/Time/GNUmakefile.preamble	2 May 2007 02:31:48 -0000
@@ -31,10 +31,5 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS +=
Index: Applications/Terminal/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Applications/Terminal/GNUmakefile,v
retrieving revision 1.72
diff -u -r1.72 GNUmakefile
--- Applications/Terminal/GNUmakefile	4 Sep 2006 12:45:09 -0000	1.72
+++ Applications/Terminal/GNUmakefile	2 May 2007 02:31:48 -0000
@@ -54,8 +54,5 @@
 MAKE_STRINGS_OPTIONS = --aggressive-match --aggressive-remove
 
 
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
-
 include $(GNUSTEP_MAKEFILES)/application.make
 
Index: Applications/TextEdit/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Applications/TextEdit/GNUmakefile.preamble,v
retrieving revision 1.2
diff -u -r1.2 GNUmakefile.preamble
--- Applications/TextEdit/GNUmakefile.preamble	4 Sep 2006 12:45:09 -0000	1.2
+++ Applications/TextEdit/GNUmakefile.preamble	2 May 2007 02:31:49 -0000
@@ -31,10 +31,5 @@
 
 ADDITIONAL_TOOL_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 ADDITIONAL_INSTALL_DIRS +=
Index: Fonts/GNUmakefile
===================================================================
RCS file: /sources/backbone/System/Fonts/GNUmakefile,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile
--- Fonts/GNUmakefile	5 Sep 2006 03:01:31 -0000	1.3
+++ Fonts/GNUmakefile	2 May 2007 02:31:49 -0000
@@ -1,3 +1,6 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+export GNUSTEP_LIBRARY
+
 all:
 	sh $(CURDIR)/makefonts
 
Index: Fonts/makefonts
===================================================================
RCS file: /sources/backbone/System/Fonts/makefonts,v
retrieving revision 1.3
diff -u -r1.3 makefonts
--- Fonts/makefonts	5 Sep 2006 03:01:31 -0000	1.3
+++ Fonts/makefonts	2 May 2007 02:31:49 -0000
@@ -2,14 +2,14 @@
 
 EXTRAS="AUTHORS BUGS LICENSE"
 
-INSTALL_DIR=$GNUSTEP_INSTALLATION_DIR
+INSTALL_DIR=$GNUSTEP_LIBRARY
 if [ ! "$INSTALL_DIR" ]; then
-	INSTALL_DIR=$GNUSTEP_SYSTEM_ROOT
+	INSTALL_DIR=$GNUSTEP_SYSTEM_LIBRARY
 fi
 if [ ! "$INSTALL_DIR" ]; then
-	INSTALL_DIR=/usr/GNUstep/System
+	INSTALL_DIR=/usr/GNUstep/System/Library
 fi
-INSTALL_DIR=${INSTALL_DIR}/Library/Fonts
+INSTALL_DIR=${INSTALL_DIR}/Fonts
 
 CMD="nfont"
 
Index: Frameworks/PrefsModule/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Frameworks/PrefsModule/GNUmakefile.preamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.preamble
--- Frameworks/PrefsModule/GNUmakefile.preamble	4 Sep 2006 12:35:22 -0000	1.3
+++ Frameworks/PrefsModule/GNUmakefile.preamble	2 May 2007 02:31:49 -0000
@@ -31,8 +31,4 @@
 # WebObjects
 ADDITIONAL_WO_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
 # Additional directories to be created during installation
Index: Tools/open/GNUmakefile.postamble
===================================================================
RCS file: /sources/backbone/System/Tools/open/GNUmakefile.postamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.postamble
--- Tools/open/GNUmakefile.postamble	5 Aug 2004 07:09:45 -0000	1.3
+++ Tools/open/GNUmakefile.postamble	2 May 2007 02:31:49 -0000
@@ -22,7 +22,7 @@
 	@-if [ -e $(GNUSTEP_TOOLS)/openapp -a ! -L $(GNUSTEP_TOOLS)/openapp ]; then \
 		echo "  Replacing the \"openapp\" script with a symlink to \"open\"..."; \
 		ln -f $(GNUSTEP_TOOLS)/openapp $(GNUSTEP_TOOLS)/openapp.gnustep; \
-		ln -sf $(GNUSTEP_INSTALLATION_DIR)/Tools/open $(GNUSTEP_TOOLS)/openapp; \
+		ln -sf $(GNUSTEP_TOOLS)/open $(GNUSTEP_TOOLS)/openapp; \
 	fi
 
 # Things to do before uninstalling
Index: Tools/open/GNUmakefile.preamble
===================================================================
RCS file: /sources/backbone/System/Tools/open/GNUmakefile.preamble,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.preamble
--- Tools/open/GNUmakefile.preamble	26 Oct 2003 11:37:22 -0000	1.1
+++ Tools/open/GNUmakefile.preamble	2 May 2007 02:31:49 -0000
@@ -35,11 +35,6 @@
 # Additional libraries when linking applications
 # ADDITIONAL_GUI_LIBS +=
 
-#
-# Flags dealing with installing and uninstalling
-#
-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
 # Additional directories to be created during installation
 # ADDITIONAL_INSTALL_DIRS +=
-ADDITIONAL_INSTALL_DIRS += $(GNUSTEP_INSTALLATION_DIR)/Tools
+ADDITIONAL_INSTALL_DIRS += $(GNUSTEP_TOOLS)