diff --git a/ChangeLog b/ChangeLog
index a3af6a89..f932a58f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 30 09:35:34 1997  Ovidiu Predescu <ovidiu@net-community.com>
+
+	* common.make: Add the cpu/os/runtime include flag only for
+	libFoundation since only it requires this for the exception files.
+	* debugapp.in: Support for GDBbundle under OPENSTEP.
+	* rules.make: Don't show the recursive make command.
+
 Wed Oct 29 09:32:26 1997  Ovidiu Predescu <ovidiu@net-community.com>
 
 	* core.make: Renamed to brain.make to avoid removing it accidentally by
diff --git a/common.make b/common.make
index 3d181886..f21a48ae 100644
--- a/common.make
+++ b/common.make
@@ -134,11 +134,14 @@ FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
 endif
 
 GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR) \
-	-I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
 	-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR) \
+	-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)
+
+ifeq ($(FOUNDATION_LIB), fd)
+GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
 	-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
-	-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR) \
 	-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME)
+endif
 
 #
 # Determine AppKit header subdirectory based upon library combo
diff --git a/debugapp.in b/debugapp.in
index 133fa2ca..b86abc2e 100644
--- a/debugapp.in
+++ b/debugapp.in
@@ -73,16 +73,15 @@ fi
 appname=`echo $app | sed 's/\.[a-z]*$//'`
 . $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
 
+
 if [ "$library_combo" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
   if [ ! -f $full_appname/$appname ]; then
     echo "$full_appname application does not have a binary for this kind of machine and operating system."
     exit 1
   fi
 
-  # From some reasons $@ does not correctly pass the arguments to the binary
-  # so I use xargs to do this.
-  # echo $@ | xargs $full_appname/$appname
-  gdb $full_appname/$appname
+  # Support for GDBbundle under OPENSTEP
+  gdb -connect TextEdit $gdbargs $full_appname/$appname
 
 else
   # Determine if the application has a binary for this operating system
@@ -96,9 +95,11 @@ else
     exit 1
   fi
 
-  # From some reasons $@ does not correctly pass the arguments to the binary
-  # so I use xargs to do this.
-  # echo $@ | xargs $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
-  gdb $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
+  # Support for GDBbundle under OPENSTEP
+  if [ $GNUSTEP_HOST_OS = nextstep4 ]; then
+    gdb -connect TextEdit $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
+  else
+    gdb $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
+  fi
 
 fi
diff --git a/rules.make b/rules.make
index e6936d73..8e7594e4 100644
--- a/rules.make
+++ b/rules.make
@@ -188,7 +188,7 @@ ALL_TEST_GUI_LIBS := \
 
 %.testlib : FORCE
 	@echo Making $*...
-	$(MAKE) --no-print-directory internal-testlib-all \
+	@$(MAKE) --no-print-directory internal-testlib-all \
 		  TEST_LIBRARY_NAME=$* \
 		  OBJC_FILES="$($*_OBJC_FILES)" \
 		  C_FILES="$($*_C_FILES)" \
@@ -242,7 +242,7 @@ ALL_TEST_GUI_LIBS := \
 
 %.checklib : FORCE
 	@echo Checking $*...
-	$(MAKE) --no-print-directory internal-check-LIBRARY \
+	@$(MAKE) --no-print-directory internal-check-LIBRARY \
 		  TEST_LIBRARY_NAME=$* \
 		  ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
 		  CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
@@ -250,7 +250,7 @@ ALL_TEST_GUI_LIBS := \
 
 %.checkbundle : FORCE
 	@echo Checking $*...
-	$(MAKE) --no-print-directory internal-check-BUNDLE \
+	@$(MAKE) --no-print-directory internal-check-BUNDLE \
 		  TEST_BUNDLE_NAME=$* \
 		  ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
 		  CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
@@ -258,7 +258,7 @@ ALL_TEST_GUI_LIBS := \
 
 %.checktool : FORCE
 	@echo Checking $*...
-	$(MAKE) --no-print-directory internal-check-TOOL \
+	@$(MAKE) --no-print-directory internal-check-TOOL \
 		  TEST_TOOL_NAME=$* \
 		  ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
 		  CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
@@ -266,7 +266,7 @@ ALL_TEST_GUI_LIBS := \
 
 %.checkapp : FORCE
 	@echo Checking $*...
-	$(MAKE) --no-print-directory internal-check-APP \
+	@$(MAKE) --no-print-directory internal-check-APP \
 		  TEST_APP_NAME=$* \
 		  ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
 		  CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \