--- gnustep-make-1.12.0/GNUmakefile.in~	2006-07-28 16:43:22.000000000 +0200
+++ gnustep-make-1.12.0/GNUmakefile.in	2006-07-28 16:56:24.000000000 +0200
@@ -148,8 +148,7 @@
 	 $(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
 	-$(EC) rm -f "$(GNUSTEP_SYSTEM_ROOT)/Makefiles"
 	 $(EC)(echo "Installing gnustep-make support software"; \
-	   $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
-	     $(makedir)/$(GNUSTEP_TARGET_DIR))
+	   $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) $(tooldir))
 	 $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
 		clean_cpu.sh clean_os.sh \
 		clean_vendor.sh cpu.sh GNUstep-reset.sh \
--- gnustep-make-1.12.0/common.make~	2006-07-28 16:43:22.000000000 +0200
+++ gnustep-make-1.12.0/common.make	2006-07-28 16:57:23.000000000 +0200
@@ -71,9 +71,9 @@
 CLEAN_OS_SCRIPT        = $(GNUSTEP_MAKEFILES)/clean_os.sh
 ifeq ($(GNUSTEP_FLATTENED),)
   WHICH_LIB_SCRIPT \
-	= $(GNUSTEP_MAKEFILES)/$(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)/which_lib
+	= $(GNUSTEP_SYSTEM_ROOT)/Tools/which_lib
 else
-  WHICH_LIB_SCRIPT = $(GNUSTEP_MAKEFILES)/which_lib
+  WHICH_LIB_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Tools/which_lib
 endif
 LD_LIB_PATH_SCRIPT     = $(GNUSTEP_MAKEFILES)/ld_lib_path.sh
 TRANSFORM_PATHS_SCRIPT = $(GNUSTEP_MAKEFILES)/transform_paths.sh