config.sub fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5368 72102866-910b-0410-8b05-ffd578937521
Deek · Dec 3, 1999 · 579575b · 579575b
1 parent 2e9d46d
commit 579575b
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 167 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+1999-12-02  Adam Fedor  <fedor@gnu.org>
+
+	* GNUstep.csh.in: Run GNUSTEP_HOST through config.sub to get correct
+	CPU, etc.
+	* GNUstep.sh.in: Likewise.
+	* debugapp.in: Likewise.
+	* executable.template.in: Likewise.
+	* names.make: Likewise.
+	* openapp.in: Likewise.
+	* opentool.in: Likewise.
+
 Fri Nov 12 11:52:14 1999  Lyndon Tremblay <ltremblay@mezzanine.xnot.com>
 
 	* rules.make: Moved some Java rules into gstep-java.

diff --git a/GNUstep.csh.in b/GNUstep.csh.in
@@ -45,6 +45,7 @@ endif
 #
 if ( ! ${?GNUSTEP_HOST} ) then
   setenv GNUSTEP_HOST `(cd /tmp; ${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.guess)`
+  setenv GNUSTEP_HOST `(cd /tmp; ${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.sub ${GNUSTEP_HOST})`
 endif
 setenv GNUSTEP_HOST_CPU `${GNUSTEP_SYSTEM_ROOT}/Makefiles/cpu.sh $GNUSTEP_HOST`
 setenv GNUSTEP_HOST_VENDOR `${GNUSTEP_SYSTEM_ROOT}/Makefiles/vendor.sh $GNUSTEP_HOST`

diff --git a/GNUstep.sh.in b/GNUstep.sh.in
@@ -48,6 +48,7 @@ export GNUSTEP_MAKEFILES
 #
 if [ -z "$GNUSTEP_HOST" ]; then
   GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.guess)`
+  GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.sub $GNUSTEP_HOST)`
 fi
 GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_HOST`
 GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_HOST`

diff --git a/MediaBook.func b/MediaBook.func
@@ -507,6 +507,7 @@ function repswitch {
 function hostinfo {
 	if [ -z "$GNUSTEP_HOST" ]; then
 		GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
+		GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST`
 		export GNUSTEP_HOST
 	fi
 	if [ -z "$GNUSTEP_HOST_CPU" ]; then
@@ -639,4 +640,4 @@ function userroot {
 		export GNUSTEP_USER_ROOT
 		assignpaths
 	fi
-}
+}
diff --git a/debugapp.in b/debugapp.in
@@ -132,6 +132,7 @@ fi
 #
 if [ -z "$GNUSTEP_HOST" ]; then
     GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
+    GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST`
     export GNUSTEP_HOST
 fi
 if [ -z "$GNUSTEP_HOST_CPU" ]; then

diff --git a/executable.template.in b/executable.template.in
@@ -153,6 +153,7 @@ fi
 #
 if [ -z "$GNUSTEP_HOST" ]; then
     GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
+    GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
     export GNUSTEP_HOST
 fi
 if [ -z "$GNUSTEP_HOST_CPU" ]; then

diff --git a/names.make b/names.make
@@ -24,7 +24,7 @@
 
 ifneq ($(internal_names_clean), yes)
   ifeq ($(GNUSTEP_HOST),)
-    GNUSTEP_HOST := $(shell (cd /tmp; $(CONFIG_GUESS_SCRIPT)))
+    GNUSTEP_HOST := $(shell (cd /tmp; $(CONFIG_SUB_SCRIPT) $(CONFIG_GUESS_SCRIPT)))
     GNUSTEP_HOST_CPU := $(shell (cd /tmp; $(CONFIG_CPU_SCRIPT) $(GNUSTEP_HOST)))
     GNUSTEP_HOST_VENDOR := $(shell (cd /tmp; $(CONFIG_VENDOR_SCRIPT) $(GNUSTEP_HOST)))
     GNUSTEP_HOST_OS := $(shell (cd /tmp; $(CONFIG_OS_SCRIPT) $(GNUSTEP_HOST)))

diff --git a/openapp.in b/openapp.in
@@ -123,6 +123,7 @@ fi
 #
 if [ -z "$GNUSTEP_HOST" ]; then
     GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
+    GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
     export GNUSTEP_HOST
 fi
 if [ -z "$GNUSTEP_HOST_CPU" ]; then

diff --git a/opentool b/opentool
diff --git a/opentool.in b/opentool.in
@@ -91,6 +91,7 @@ fi
 #
 if [ -z "$GNUSTEP_HOST" ]; then
     GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
+    GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
     export GNUSTEP_HOST
 fi
 if [ -z "$GNUSTEP_HOST_CPU" ]; then