diff --git a/ChangeLog b/ChangeLog
index 0d70eb44..0541e931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 17 13:05:44 1997  Ovidiu Predescu <ovidiu@net-community.com>
+
+	* application.make: Output the file containing the paths for the
+	dynamic linker for each library combo instead of a global file for all
+	the combinations.
+	* openapp.in: Support the above change.
+	* debugapp.in: Likewise.
+	* rules.m (ALL_OBJCFLAGS, ALL_CFLAGS): Remove unnecessary -I.
+
 Fri Nov 14 12:51:16 1997  Scott Christley  <scottc@net-community.com>
 
 	* test-application.make: New file.
diff --git a/application.make b/application.make
index 8433ea27..e887b2df 100644
--- a/application.make
+++ b/application.make
@@ -96,12 +96,15 @@ endif
 $(APP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
 	$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
 		$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
+ifeq ($(OBJC_COMPILER), NeXT)
 	@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
 		>$(APP_DIR_NAME)/library_paths.openapp
-ifeq ($(OBJC_COMPILER), NeXT)
 # This is a hack for OPENSTEP systems to remove the iconheader file
 # automatically generated by the makefile package.
 	rm -f $(INTERNAL_app_NAME).iconheader
+else
+	@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
+	>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)/library_paths.openapp
 endif
 
 #
diff --git a/debugapp.in b/debugapp.in
index 7ef8bbe8..282ed198 100644
--- a/debugapp.in
+++ b/debugapp.in
@@ -74,10 +74,6 @@ if [ -z "$full_appname" ]; then
   exit 1
 fi
 
-if [ -f "$full_appname/library_paths.openapp" ]; then
-  additional_library_paths="`cat $full_appname/library_paths.openapp`"
-fi
-
 #
 # Determine the host information
 #
@@ -101,6 +97,16 @@ if [ -z "$GNUSTEP_HOST_OS" ]; then
    export GNUSTEP_HOST_OS
 fi
 
+if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
+  if [ -f "$full_appname/library_paths.openapp" ]; then
+    additional_library_paths="`cat $full_appname/library_paths.openapp`"
+  fi
+else
+  if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
+    additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
+  fi
+fi
+
 appname=`echo $app | sed 's/\.[a-z]*$//'`
 . $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
 
diff --git a/openapp.in b/openapp.in
index 44b5a159..c3fc740a 100755
--- a/openapp.in
+++ b/openapp.in
@@ -74,10 +74,6 @@ if [ -z "$full_appname" ]; then
   exit 1
 fi
 
-if [ -f "$full_appname/library_paths.openapp" ]; then
-  additional_library_paths="`cat $full_appname/library_paths.openapp`"
-fi
-
 #
 # Determine the host information
 #
@@ -101,6 +97,16 @@ if [ -z "$GNUSTEP_HOST_OS" ]; then
    export GNUSTEP_HOST_OS
 fi
 
+if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
+  if [ -f "$full_appname/library_paths.openapp" ]; then
+    additional_library_paths="`cat $full_appname/library_paths.openapp`"
+  fi
+else
+  if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
+    additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
+  fi
+fi
+
 appname=`echo $app | sed 's/\.[a-z]*$//'`
 . $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
 
diff --git a/rules.make b/rules.make
index 709f1c75..4cc5036a 100644
--- a/rules.make
+++ b/rules.make
@@ -110,14 +110,14 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
    $(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
    $(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
    $(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
-   -I$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
+   $(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
    -I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
 
 ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
    $(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
    $(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
    $(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
-   -I$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
+   $(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
    -I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
 
 ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \