use flex & bison from ../ if they exist

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 078f5a13deadde00a20604283f76ed8c1fbd74a7..dc721c88e45461db10a6b863d18f663dd29582ef 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+Wed May  6 11:07:35 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+       * Makefile.in: use flex & bison from ../ if they exist.
+
 Tue May  5 17:47:33 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 
        * relax.c (build_it): don't allocate space in the output file for

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 3941679a90d4c9794f69501dd4a10c40ca690891..ec3b43c78e5fe7c149dc20397688b14e5f2fcad6 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -53,11 +53,11 @@ INSTALL_DATA = $(INSTALL)
 AR = ar
 AR_FLAGS = qv
 CFLAGS = -g
-BISON = bison -y
 MAKEINFO = makeinfo
 RANLIB = ranlib
 
-LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex -S$(srcdir)/../flex/flex.skel ; else echo flex ; fi`
+BISON = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
+LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex -S../flex/flex.skel ; else echo flex ; fi`
 
 #version=/`./../gcc/gcc -dumpversion`
 version=