Makefile.in (BISON): Use bison from the build tree if it exists.

        * Makefile.in (BISON): Use bison from the build tree if it exists.
        (FLEX): Similarly.

From-SVN: r19825

gcc/ChangeLog

+Mon May 18 01:23:33 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (BISON): Use bison from the build tree if it exists.
+	(FLEX): Similarly.
+
 Mon May 18 00:08:19 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* gcc.c (SWITCH_CURTAILS_COMPILATION): Definition.

gcc/Makefile.in

@@ -72,9 +72,15 @@ X_CPPFLAGS =
 T_CPPFLAGS =
 
 CC = @CC@
-BISON = bison
+# srcdir might be a relative pathname which won't be valid in a subdirectory,
+# so we must use objdir/srcdir instead to make it safe.  objdir is always
+# a full pathname.
+BISON = `if [ -f $(objdir)/../bison/bison ] ; then case $(srcdir) in \
+	/*) echo $(objdir)/../bison/bison -L $(srcdir)/../bison/ ;; \
+	*) echo $(objdir)/../bison/bison -L $(objdir)/$(srcdir)/../bison/ ;; \
+	esac else echo bison ; fi`
 BISONFLAGS =
-LEX = flex
+LEX = `if [ -f $(objdir)/../flex/flex ] ; then echo $(objdir)/../flex/flex ; else echo flex ; fi`
 LEXFLAGS =
 AR = ar
 AR_FLAGS = rc

gcc/cp/ChangeLog

+Mon May 18 01:24:08 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (BISON): Use bison from the build tree if it exists.
+	(FLEX): Similarly.
+
 Sun May 17 14:52:08 1998  Martin v. Loewis  <loewis@informatik.hu-berlin.de>
 
 	* typeck.c (type_unknown_p): Return true for TREE_LIST also.

gcc/cp/Makefile.in

@@ -55,9 +55,9 @@ X_CPPFLAGS =
 T_CPPFLAGS =
 
 CC = @CC@
-BISON = bison
+BBISON = `if [ -f ../../bison/bison ] ; then echo ../../bison/bison -L $(srcdir)/../../bison/ ;  else echo bison ; fi`
 BISONFLAGS =
-LEX = flex
+LEX = `if [ -f ../../flex/flex ] ; then echo ../../flex/flex ;  else echo flex ; fi`
 LEXFLAGS =
 AR = ar
 AR_FLAGS = rc