Only in Addresses-0.4.6/AddressManager: AddressManager.app
diff -ru Addresses-0.4.6/Frameworks/Addresses/GNUmakefile Addresses-0.4.6.nicola/Frameworks/Addresses/GNUmakefile
--- Addresses-0.4.6/Frameworks/Addresses/GNUmakefile	2004-07-29 16:36:21.000000000 +0100
+++ Addresses-0.4.6.nicola/Frameworks/Addresses/GNUmakefile	2007-03-07 18:56:57.000000000 +0000
@@ -49,6 +49,6 @@
 -include GNUmakefile.postamble
 
 after-Addresses-install::
-	ln -sf $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/Addresses \
-	       $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/AddressBook
+	ln -sf $(GNUSTEP_HEADERS)/Addresses \
+	       $(GNUSTEP_HEADERS)/AddressBook
 
diff -ru Addresses-0.4.6/GNUmakefile Addresses-0.4.6.nicola/GNUmakefile
--- Addresses-0.4.6/GNUmakefile	2004-07-29 16:36:21.000000000 +0100
+++ Addresses-0.4.6.nicola/GNUmakefile	2007-03-07 18:57:47.000000000 +0000
@@ -1,3 +1,7 @@
+ifeq ($(GNUSTEP_MAKEFILES),)
+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
+endif
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 PACKAGE_NAME = Addresses
diff -ru Addresses-0.4.6/Goodies/LDAPAddressBook/LDAPAddressBookClass/GNUmakefile Addresses-0.4.6.nicola/Goodies/LDAPAddressBook/LDAPAddressBookClass/GNUmakefile
--- Addresses-0.4.6/Goodies/LDAPAddressBook/LDAPAddressBookClass/GNUmakefile	2004-07-29 16:36:21.000000000 +0100
+++ Addresses-0.4.6.nicola/Goodies/LDAPAddressBook/LDAPAddressBookClass/GNUmakefile	2007-03-07 18:55:01.000000000 +0000
@@ -2,7 +2,7 @@
 BUNDLE_NAME=LDAPAddressBook
 BUNDLE_EXTENSION=.abclass
 
-LDAPAddressBook_INSTALL_DIR=$(GNUSTEP_ROOT)/Local/Library/Addresses
+LDAPAddressBook_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Addresses
 LDAPAddressBook_OBJC_FILES=LDAPAddressBook.m utils.m
 LDAPAddressBook_RESOURCE_FILES=LDAPPersonMapping.plist
 LDAPAddressBook_MAIN_CLASS=LDAPAddressBook
diff -ru Addresses-0.4.6/Goodies/VCFViewer/GNUmakefile Addresses-0.4.6.nicola/Goodies/VCFViewer/GNUmakefile
--- Addresses-0.4.6/Goodies/VCFViewer/GNUmakefile	2004-07-29 16:36:21.000000000 +0100
+++ Addresses-0.4.6.nicola/Goodies/VCFViewer/GNUmakefile	2007-03-07 18:55:46.000000000 +0000
@@ -1,13 +1,13 @@
 
+# hack -- GWorkspace won't find bundles if they weren't installed in
+#   ~/GNUstep/Library/GWorkspace 
+GNUSTEP_INSTALLATION_DOMAIN = USER
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME = VCFViewer
 BUNDLE_EXTENSION = .inspector
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GWorkspace
-
-# hack -- GWorkspace won't find bundles if they weren't installed in
-#   ~/GNUstep/Library/GWorkspace 
-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/GWorkspace
 
 VCFViewer_HAS_RESOURCE_BUNDLE = yes
 
@@ -31,7 +31,7 @@
 	@echo "*** WARNING: Due to a GWorkspace limitation, VCFViewer.inspector"
 	@echo "***          currently MUST be installed at ~/GNUstep/Library/GWorkspace"
 	@echo "***          (in your case, $(BUNDLE_INSTALL_DIR))."
-	@echo "***          Your settings for GNUSTEP_INSTALLATION_DIR (if any)"
+	@echo "***          Your settings for GNUSTEP_INSTALLATION_DOMAIN (if any)"
 	@echo "***          have been overridden."
 	@echo "***"
 	@echo "***"
diff -ru Addresses-0.4.6/INSTALL Addresses-0.4.6.nicola/INSTALL
--- Addresses-0.4.6/INSTALL	2004-07-29 16:36:21.000000000 +0100
+++ Addresses-0.4.6.nicola/INSTALL	2007-03-07 18:56:24.000000000 +0000
@@ -1,8 +1,8 @@
-1. Make sure you have sourced the file
+1. Make sure your GNUstep environment is setup.  Usually, this means that you have sourced the file
 
-      $GNUSTEP_ROOT/System/Library/Makefiles/GNUstep.sh
+      $GNUSTEP_MAKEFILES/GNUstep.sh
 
-   You can test this by typing "echo $GNUSTEP_ROOT". If that gives an
+   You can test this by typing "echo $GNUSTEP_MAKEFILES". If that gives an
    empty line, you need to source the mentioned file.
 
 2. Type 
diff -ru Addresses-0.4.6/README Addresses-0.4.6.nicola/README
--- Addresses-0.4.6/README	2004-07-29 16:36:21.000000000 +0100
+++ Addresses-0.4.6.nicola/README	2007-03-07 18:54:10.000000000 +0000
@@ -82,9 +82,10 @@
 To keep the library and application as open as possible, it is extensible via
 plugins. These are loaded from the usual places: 
 
-	 $(GNUSTEP_ROOT)/System/Library/Addresses 
-	 $(GNUSTEP_ROOT)/Local/Library/Addresses 
-	 $(HOME)/GNUstep/Library/Addresses 
+	 $(GNUSTEP_SYSTEM_LIBRARY)/Addresses
+	 $(GNUSTEP_NETWORK_LIBRARY)/Addresses  
+	 $(GNUSTEP_LOCAL_LIBRARY)/Addresses
+	 $(GNUSTEP_USER_LIBRARY)/Addresses 
 
 There are currently two kinds of plugins, and they usually appear in pairs of
 two: plugins that provide new address book classes, and plugins that contain