Make `make distcheck' work.

* lib/Makefile.am (INCLUDES): Add top_srcdir/intl, since hash uses
system.h which uses libgettext.h.

diff --git a/ChangeLog b/ChangeLog
index 21c7c4734fcb0f27424b59a6e20aa30feefe76b5..bbca444ba9c2e56d187f0b82898451984627e636 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-15  Akim Demaille  <akim@epita.fr>
+
+       Make `make distcheck' work.
+
+       * lib/Makefile.am (INCLUDES): Add top_srcdir/intl, since hash uses
+       system.h which uses libgettext.h.
+
 2001-12-15  Akim Demaille  <akim@epita.fr>
 
        * src/nullable.c (set_nullable): Useless rules must be skipped,

diff --git a/TODO b/TODO
index b80c259cb2333a526e31bcb924f26de161f26cf5..62622a61a15a47fe063e05f7dd39b9b9355b76d3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,12 +1,9 @@
 -*- outline -*-
 
-* src/reader.c
-Check and cleanup for CPP-out code.    [ok]
-
-* src/output.c
-Check and cleanup for CPP-out code.    [ok]
-** %%input-line is not correct at this time.   [ok]
-Rely with bison.simple.
+* tokendefs
+This muscle should not exist: the information it contains should be
+available from the rest of bison.  Once the information public, get
+rid of it.
 
 * Broken options ?.
 ** %no-lines           [ok]
@@ -33,9 +30,9 @@ Removing warnings when compiling. (gcc-warnings).     [ok]
 Find the best graph parameters.        []
 
 * doc/bison.texinfo
-** Update 
+** Update
 informations about ERROR_VERBOSE.      []
-** Add explainations about 
+** Add explainations about
 skeleton muscles.      []
 %skeleton.             []
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4fc4e488bf031fab7dc4fd3d06608183c58a2a95..e873c8f326e84c3a45ca03998523d2fc06404b59 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,13 @@ CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
 
 noinst_LIBRARIES = libbison.a
 
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl
+# libintl.h in is build/intl, libgettext.h in src/intl/,
+# config.h in build/., and system.h is in src/src/.
+INCLUDES = -I$(top_builddir)/intl \
+           -I$(top_builddir)      \
+           -I$(top_srcdir)/ \
+           -I$(top_srcdir)/intl \
+           -I$(top_srcdir)/lib
 
 # Heck, we are still using an old version of Automake which does not
 # understand LIBOBJ additions using $objext...