* Makefile.in: Replace all occurrances of "rootme" with "r" and "$${rootme}"

with "$$r", to increase the likelihood that the do-* commands (plus user
environment) will fit SCO limits.

2 files changed, 60 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index fa0d4c2..c6c3ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+Mon Jan 17 15:06:56 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in: Replace all occurrances of "rootme" with "r" and
+	"$${rootme}" with "$$r", to increase the likelihood that the do-*
+	commands (plus user environment) will fit SCO limits.
+
 Thu Jan  6 11:20:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* configure.in: Don't issue warnings about directories which are
-	not being configued if -norecursion is set.
+	not being configured if -norecursion is set.  Correct test for
+	--with-gnu-as and --with-gnu-ld to not get confused by substring
+	matches.
 
 	* configure.in: Don't build gas for alpha-dec-osf1*.
 
diff --git a/Makefile.in b/Makefile.in
index f3fa90f..4774c50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,7 @@ SHELL = /bin/sh
 
 INSTALL = $${srcroot}/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 
 AS = as
@@ -71,24 +71,25 @@ CXXFLAGS = -g -O
 RANLIB = ranlib
 NM = nm
 MUNCH_NM = $(NM)
-GZIP = gzip
+# Not plain GZIP, since gzip looks there for extra command-line options.
+GZIPPROG = gzip
 
 # BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove.
-BISON = `if [ -f $${rootme}/byacc/byacc ] ; \
-	    then echo $${rootme}/byacc/byacc ; \
+BISON = `if [ -f $$r/byacc/byacc ] ; \
+	    then echo $$r/byacc/byacc ; \
 	    else echo byacc ; \
 	fi`
 
-LEX = `if [ -f $${rootme}/flex/flex ] ; \
-	then echo $${rootme}/flex/flex ; \
+LEX = `if [ -f $$r/flex/flex ] ; \
+	then echo $$r/flex/flex ; \
 	else echo flex ; fi`
 
-M4 = `if [ -f $${rootme}/m4/m4 ] ; \
-	then echo $${rootme}/m4/m4 ; \
+M4 = `if [ -f $$r/m4/m4 ] ; \
+	then echo $$r/m4/m4 ; \
 	else echo m4 ; fi`
 
-MAKEINFO = `if [ -f $${rootme}/texinfo/makeinfo/makeinfo ] ; \
-	then echo $${rootme}/texinfo/makeinfo/makeinfo ; \
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+	then echo $$r/texinfo/makeinfo/makeinfo ; \
 	else echo makeinfo ; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
@@ -96,8 +97,8 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/makeinfo/makeinfo ] ; \
 # using the makeinfo from the object tree.
 MAKEINFOFLAGS =
 
-EXPECT = `if [ -f $${rootme}/expect/expect ] ; \
-	then echo $${rootme}/expect/expect ; \
+EXPECT = `if [ -f $$r/expect/expect ] ; \
+	then echo $$r/expect/expect ; \
 	else echo expect ; fi`
 
 RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \
@@ -124,8 +125,8 @@ INSTALL_TARGET = install-dirs \
 	install-gcc
 
 CC_FOR_TARGET = ` \
-  if [ -f $${rootme}/gcc/Makefile ] ; then \
-    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
+  if [ -f $$r/gcc/Makefile ] ; then \
+    echo $$r/gcc/xgcc -B$$r/gcc/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -136,8 +137,8 @@ CC_FOR_TARGET = ` \
 
 # start-sanitize-chill
 CHILL_FOR_TARGET = ` \
-  if [ -f $${rootme}/gcc/Makefile ] ; then \
-    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/ -L$${rootme}/chillrt/; \
+  if [ -f $$r/gcc/Makefile ] ; then \
+    echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/chillrt/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -149,8 +150,8 @@ CHILL_FOR_TARGET = ` \
 # end-sanitize-chill
 
 CXX_FOR_TARGET = ` \
-  if [ -f $${rootme}/gcc/Makefile ] ; then \
-    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
+  if [ -f $$r/gcc/Makefile ] ; then \
+    echo $$r/gcc/xgcc -B$$r/gcc/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CXX); \
@@ -160,8 +161,8 @@ CXX_FOR_TARGET = ` \
   fi`
 
 AS_FOR_TARGET = ` \
-  if [ -f $${rootme}/gas/Makefile ] ; then \
-    echo $${rootme}/gas/as.new ; \
+  if [ -f $$r/gas/Makefile ] ; then \
+    echo $$r/gas/as.new ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(AS); \
@@ -171,8 +172,8 @@ AS_FOR_TARGET = ` \
   fi`
 
 AR_FOR_TARGET = ` \
-  if [ -f $${rootme}/binutils/ar ] ; then \
-    echo $${rootme}/binutils/ar ; \
+  if [ -f $$r/binutils/ar ] ; then \
+    echo $$r/binutils/ar ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(AR); \
@@ -182,8 +183,8 @@ AR_FOR_TARGET = ` \
   fi`
 
 RANLIB_FOR_TARGET = ` \
-  if [ -f $${rootme}/binutils/ranlib ] ; then \
-    echo $${rootme}/binutils/ranlib ; \
+  if [ -f $$r/binutils/ranlib ] ; then \
+    echo $$r/binutils/ranlib ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(RANLIB); \
@@ -193,8 +194,8 @@ RANLIB_FOR_TARGET = ` \
   fi`
 
 NM_FOR_TARGET = ` \
-  if [ -f $${rootme}/binutils/Makefile ] ; then \
-    echo $${rootme}/binutils/nm ; \
+  if [ -f $$r/binutils/Makefile ] ; then \
+    echo $$r/binutils/nm ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(NM); \
@@ -205,11 +206,11 @@ NM_FOR_TARGET = ` \
 
 # FIXME: This is badly named.
 XTRAFLAGS = ` \
-  if [ -f $${rootme}/gcc/Makefile ] ; then \
-    if [ -f $${rootme}/newlib/Makefile ] ; then \
-      echo -I$${rootme}/newlib/targ-include -I$${srcroot}/newlib/libc/include -I$${rootme}/gcc/include -nostdinc ; \
+  if [ -f $$r/gcc/Makefile ] ; then \
+    if [ -f $$r/newlib/Makefile ] ; then \
+      echo -I$$r/newlib/targ-include -I$${srcroot}/newlib/libc/include -I$$r/gcc/include -nostdinc ; \
     else \
-      echo -I$${rootme}/gcc/include ; \
+      echo -I$$r/gcc/include ; \
     fi ; \
   else \
      echo ; \
@@ -253,6 +254,7 @@ BASE_FLAGS_TO_PASS = \
 	"RUNTEST=$(RUNTEST)" \
 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
 	"XTRAFLAGS_FOR_TARGET=$(XTRAFLAGS)" \
+	"YACC=$(BISON)" \
 	"exec_prefix=$(exec_prefix)" \
 	"prefix=$(prefix)" \
 	"tooldir=$(tooldir)" 
@@ -561,7 +563,7 @@ DO_X = \
 .PHONY: $(DO_X)
 $(DO_X):
 	@target=`echo $@ | sed -e 's/^do-//'`; \
-	rootme=`pwd`; export rootme; \
+	r=`pwd`; export r; \
 	srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	for i in $(SUBDIRS); do \
 	  if [ -f ./$$i/Makefile ]; then \
@@ -643,7 +645,7 @@ vault-install:
 .PHONY: install.all
 install.all: install-no-fixedincludes
 	@if [ -f ./gcc/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
+		r=`pwd` ; export r ; \
 		(cd ./gcc; \
 		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
 	else \
@@ -672,7 +674,7 @@ gcc-no-fixedincludes:
 	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
 	  touch gcc/stmp-fixinc gcc/stmp-fixproto; \
 	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd` ; export srcroot; \
 	  (cd ./gcc; \
 	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@@ -687,7 +689,7 @@ gcc-no-fixedincludes:
 $(ALL_MODULES) all-glob:
 	@dir=`echo $@ | sed -e 's/all-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
 	else \
@@ -700,7 +702,7 @@ $(ALL_MODULES) all-glob:
 $(CHECK_MODULES):
 	@dir=`echo $@ | sed -e 's/check-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
 	else \
@@ -713,7 +715,7 @@ $(CHECK_MODULES):
 $(INSTALL_MODULES): install-dirs
 	@dir=`echo $@ | sed -e 's/install-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
 	else \
@@ -726,7 +728,7 @@ $(INSTALL_MODULES): install-dirs
 $(ALL_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/all-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
 	else \
@@ -739,7 +741,7 @@ $(ALL_TARGET_MODULES):
 $(CHECK_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/check-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) check); \
 	else \
@@ -753,7 +755,7 @@ $(CHECK_TARGET_MODULES):
 $(INSTALL_TARGET_MODULES): install-dirs
 	@dir=`echo $@ | sed -e 's/install-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
 	else \
@@ -766,7 +768,7 @@ $(INSTALL_TARGET_MODULES): install-dirs
 $(ALL_X11_MODULES):
 	@dir=`echo $@ | sed -e 's/all-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; \
 	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
@@ -780,7 +782,7 @@ $(ALL_X11_MODULES):
 $(CHECK_X11_MODULES):
 	@dir=`echo $@ | sed -e 's/check-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; \
 	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
@@ -794,7 +796,7 @@ $(CHECK_X11_MODULES):
 $(INSTALL_X11_MODULES):
 	@dir=`echo $@ | sed -e 's/install-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd $${dir}; \
 	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
@@ -806,7 +808,7 @@ $(INSTALL_X11_MODULES):
 .PHONY: all-gcc
 all-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
 	else \
@@ -816,7 +818,7 @@ all-gcc:
 .PHONY: check-gcc
 check-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
 	else \
@@ -826,7 +828,7 @@ check-gcc:
 .PHONY: install-gcc
 install-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  rootme=`pwd`; export rootme; \
+	  r=`pwd`; export r; \
 	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
 	else \
@@ -1029,7 +1031,7 @@ make-gdb.tar.gz: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 		echo "==> Making gdb-$$VER.tar.gz"; \
 		rm -f gdb-$$VER; ln -s proto-toplev gdb-$$VER; \
 		tar cfh - gdb-$$VER \
-		| $(GZIP) -v -9 >gdb-$$VER.tar.gz)
+		| $(GZIPPROG) -v -9 >gdb-$$VER.tar.gz)
 
 	# Make the testsuite archive separately.
 	ln -s ../../gdb/proto-testsuite.dir/testsuite proto-toplev/gdb/testsuite
@@ -1045,13 +1047,13 @@ make-gdb.tar.gz: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 		tar cfh - gdb-$$VER/configure gdb-$$VER/config.guess \
 			gdb-$$VER/config.sub gdb-$$VER/move-if-change \
 			gdb-$$VER/gdb/testsuite \
-			| $(GZIP) -v -9 >gdb-$$VER-testsuite.tar.gz)
+			| $(GZIPPROG) -v -9 >gdb-$$VER-testsuite.tar.gz)
 
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.
 SUPPORT_FILES = list-of-support-files-for-tool-in-question
 # Directories that might want `make diststuff' run.
-DISTSTUFFDIRS= ld gprof gdb libg++ binutils
+DISTSTUFFDIRS= ld gprof gdb libg++ binutils gnats
 # Files where "byacc" (Cygnus version) should be changed to "bison -y" (FSF).
 DISTBISONFILES= binutils/Makefile.in gas/Makefile.in gdb/Makefile.in
 # Directories where "info" should be built.
@@ -1127,7 +1129,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
 		echo "==> Making $(TOOL)-$$VER.tar.gz"; \
 		rm -f $(TOOL)-$$VER; ln -s proto-toplev $(TOOL)-$$VER; \
 		tar cfh - $(TOOL)-$$VER \
-		| $(GZIP) -v -9 > $(TOOL)-$$VER.tar.gz )
+		| $(GZIPPROG) -v -9 >$(TOOL)-$$VER.tar.gz )
 
 TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)