[PATCH] master: build: fix paths.

[Akim Demaille]

When using $(top_builddir) inconsistently, Make (including GNU
Make) is sometimes confused.  As a result it may want to build
lib/libbison.la and $(top_builddir)/lib/libbison.la (the same
file, different names) concurrently, which, amusingly enough,
might end with:

  ranlib lib/libbison.a
  ranlib lib/libbison.a
  make[2]: *** [lib/libbison.a] Segmentation fault

on OS X.

        * doc/local.mk, src/local.mk: Do not use $(top_builddir) when not
        needed.
---
 ChangeLog    |   18 ++++++++++++++++++
 doc/local.mk |    2 +-
 src/local.mk |    4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73fa402..6fb1ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2009-08-12  Akim Demaille  <address@hidden>
 
+       build: fix paths.
+       When using $(top_builddir) inconsistently, Make (including GNU
+       Make) is sometimes confused.  As a result it may want to build
+       lib/libbison.la and $(top_builddir)/lib/libbison.la (the same
+       file, different names) concurrently, which, amusingly enough,
+       might end with:
+
+         ranlib lib/libbison.a
+         ranlib lib/libbison.a
+         make[2]: *** [lib/libbison.a] Segmentation fault
+
+       on OS X.
+
+       * doc/local.mk, src/local.mk: Do not use $(top_builddir) when not
+       needed.
+
+2009-08-12  Akim Demaille  <address@hidden>
+
        distcheck: fix.
 
         * examples/calc++/Makefile.am: (EXTRA_DIST): Ship calc.stamp.
diff --git a/doc/local.mk b/doc/local.mk
index cf68a98..cb7d00d 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -35,7 +35,7 @@ $(CROSS_OPTIONS_TEXI): $(top_srcdir)/src/getargs.c 
$(CROSS_OPTIONS_PL)
        { test ! -f $@ || cat $@; } >address@hidden
        test ! -f address@hidden || rm -f address@hidden
        $(MAKE) $(AM_MAKEFLAGS) src/bison$(EXEEXT)
-       $(top_builddir)/src/bison --help |                               \
+       src/bison --help |                               \
          perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >address@hidden
        diff -u address@hidden address@hidden || true
        mv address@hidden $@
diff --git a/src/local.mk b/src/local.mk
index 7351b27..753172b 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -20,11 +20,11 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS += -I$(top_builddir)
 
-LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL)
+LDADD = lib/libbison.a $(LIBINTL)
 
 # Use our own Bison to build the parser.  Of course, you ought to
 # keep a sane version of Bison nearby...
-BISON = $(top_builddir)/tests/bison
+BISON = tests/bison
 YACC = $(BISON) -y
 AM_YFLAGS = -dv --warnings=all,error --report=all
 
-- 
1.6.4