Updated makefile corner case for custom filesystem layouts

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24707 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,15 @@
+2007-02-27  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* Source/GNUmakefile.preamble (GNUSTEP_INSTALL_PREFIX): Variable
+	removed as it could not work with custom filesystem layouts.
+	(GNUSTEP_TOOLS_NO_DESTDIR): New variable.
+	(ADDITIONAL_CPPFLAGS): Pass GNUSTEP_TOOLS_NO_DESTDIR, not
+	GNUSTEP_INSTALL_PREFIX.
+	* Source/NSPasteboard.m ([+_pbs]): Use GNUSTEP_TOOLS_NO_DESTDIR
+	instead of GNUSTEP_INSTALL_PREFIX. 
+	* Source/NSSound.m ([+gsnd]): Same change.
+	* Source/NSWorkspace.m ([-findApplications]): Same change.
+
 2007-02-27  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* gnustep-gui-debug.spec.in: Obsolete file removed.

Source/GNUmakefile.preamble

@@ -38,13 +38,16 @@
 # Flags dealing with compiling and linking
 #
 
-# GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because
-# the installing person may set it on the `make' command line.
-GNUSTEP_INSTALL_PREFIX=$(GNUSTEP_SYSTEM_ROOT)
+# This GNUSTEP_TOOLS_NO_DESTDIR is used to somehow locate the gui
+# Tools when we are not using gnustep-base (currently, that's mostly a
+# hypothetical case!).  It should be the same as GNUSTEP_TOOLS, except
+# that DESTDIR is not included.  It's not used if we are using
+# gnustep-base.
+GNUSTEP_TOOLS_NO_DESTDIR = $(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_TOOLS)
 
 # Additional flags to pass to the preprocessor
 ADDITIONAL_CPPFLAGS =  \
-	-DGNUSTEP_INSTALL_PREFIX=$(GNUSTEP_INSTALL_PREFIX) \
+	-DGNUSTEP_TOOLS_NO_DESTDIR=\"$(GNUSTEP_TOOLS_NO_DESTDIR)\" \
 	-DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
 	-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
 	-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \

Source/NSPasteboard.m

@@ -1979,9 +1979,8 @@ static  NSMapTable              *mimeMap = NULL;
 		GSToolsDirectory, NSSystemDomainMask, YES) objectAtIndex: 0]
 		stringByAppendingPathComponent: @"gpbs"]);
 #else
-	      cmd = RETAIN([[@GNUSTEP_INSTALL_PREFIX 
-		stringByAppendingPathComponent: @"Tools"] 
-		stringByAppendingPathComponent: @"gpbs"]);
+	      path = RETAIN([@GNUSTEP_TOOLS_NO_DESTDIR
+			      stringByAppendingPathComponent: @"gpbs"]);
 #endif
 	    }
 	  if (recursion == YES || cmd == nil)

Source/NSSound.m

@@ -178,8 +178,7 @@ static id<GSSoundSvr> the_server = nil;
 								objectAtIndex: 0]
 			     stringByAppendingPathComponent: @"gnustep_sndd"]);
 #else
-	      cmd = RETAIN([[@GNUSTEP_INSTALL_PREFIX 
-			      stringByAppendingPathComponent: @"Tools"] 
+	      cmd = RETAIN([@GNUSTEP_TOOLS_NO_DESTDIR
 			     stringByAppendingPathComponent: @"gnustep_sndd"]);
 #endif
 	    }

Source/NSWorkspace.m

@@ -1251,9 +1251,8 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
 	  GSToolsDirectory, NSSystemDomainMask, YES) objectAtIndex: 0] 
 		 stringByAppendingPathComponent: @"make_services"]);
 #else
-      path = RETAIN([[@GNUSTEP_INSTALL_PREFIX 
-			 stringByAppendingPathComponent: @"Tools"] 
-			stringByAppendingPathComponent: @"make_services"]);
+      path = RETAIN([@GNUSTEP_TOOLS_NO_DESTDIR
+		      stringByAppendingPathComponent: @"make_services"]);
 #endif
     }
   task = [NSTask launchedTaskWithLaunchPath: path