Wed Feb 28 12:25:46 1996 Jason Merrill <jason@yorick.cygnus.com>

	* Makefile.in (taz): Fix quoting.

diff --git a/ChangeLog b/ChangeLog
index feaf6b29302ff3ca09830775ba6b0d40c3a8aad7..82d053cec40274529d4c5490c85547f0233bb895 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 28 12:25:46 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * Makefile.in (taz): Fix quoting.
+
 Tue Feb 27 11:33:57 1996  Doug Evans  <dje@charmed.cygnus.com>
 
        * configure.in (sparclet-*-*): Build everything now.

diff --git a/Makefile.in b/Makefile.in
index ed769bc1b41da5f54505af0ac4cffef88f4b6c71..0f1a8e483f47e42c48421c50ff3eb63561e5a097 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,15 +93,19 @@ NM = nm
 # Not plain GZIP, since gzip looks there for extra command-line options.
 GZIPPROG = gzip
 
+# These values are substituted by configure.
+DEFAULT_YACC = yacc
+DEFAULT_LEX = lex
+
 # BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove.
 BISON = `if [ -f $$r/byacc/byacc ] ; \
            then echo $$r/byacc/byacc ; \
-           else echo byacc ; \
+           else echo ${DEFAULT_YACC} ; \
        fi`
 
 LEX = `if [ -f $$r/flex/flex ] ; \
        then echo $$r/flex/flex ; \
-       else echo flex ; fi`
+       else echo ${DEFAULT_LEX} ; fi`
 
 M4 = `if [ -f $$r/m4/m4 ] ; \
        then echo $$r/m4/m4 ; \
@@ -1276,7 +1280,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
        ./configure sun4
        [ -z "$(CONFIGURE_TARGET_MODULES)" ] \
          || $(MAKE) $(CONFIGURE_TARGET_MODULES) ALL_GCC="" \
-           CC_FOR_TARGET="$(CC) CXX_FOR_TARGET="$(CXX)"
+           CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
        # Make links, and run "make diststuff" or "make info" when needed.
        rm -rf proto-toplev ; mkdir proto-toplev
        set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \