Revert change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5873 72102866-910b-0410-8b05-ffd578937521
Deek · Jan 26, 2000 · 183010c · 183010c
1 parent 8f62726
commit 183010c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-26  Adam Fedor  <fedor@gnu.org>
+
+	* rules.make: Revert previous change of parens around tmp.
+
 2000-01-22 Manuel Guesdon <mguesdon@sbuilders.com>
 
 	*  gswapp.make and gswbundle.make: tar options changed 

diff --git a/names.make b/names.make
@@ -24,7 +24,8 @@
 
 ifneq ($(internal_names_clean), yes)
   ifeq ($(GNUSTEP_HOST),)
-    GNUSTEP_HOST := $(shell (cd /tmp; $(CONFIG_SUB_SCRIPT) $(CONFIG_GUESS_SCRIPT)))
+    GNUSTEP_HOST_GUESS := $(shell (cd /tmp; $(CONFIG_GUESS_SCRIPT)))
+    GNUSTEP_HOST := $(shell (cd /tmp; $(CONFIG_SUB_SCRIPT) $(CONFIG_HOST_GUESS)))
     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/rules.make b/rules.make
@@ -183,8 +183,8 @@ $(JAVA_OBJ_PREFIX)%.class : %.java
 %.build:
 	@(echo Making $(OPERATION) for $(TARGET_TYPE) $*...; \
         tmp="$($*_SUBPROJECTS)"; \
-        if test "x$(tmp)" != x ; then \
-          for f in $tmp; do \
+        if test "x$$tmp" != x ; then \
+          for f in $$tmp; do \
 	    mf=$(MAKEFILE_NAME); \
 	    if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \
 	      mf=Makefile; \