FYI: -I $(top_srcdir)

[Akim Demaille]

Hum...  Now I think about it, it would be safer to put the builds
before the srcs so that if by accident a file is present in both dirs,
the built one is kept.

That shouldn't happen though.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * util/Makefile.am, info/Makefile.am, makeinfo/Makefile.am,
        * lib/Makefile.am (DEFS): Remove, included in...
        (AM_CPPFLAGS): this.
        Add -I $(top_srcdir) to find system.h.


Index: info/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile.am
--- info/Makefile.am 19 Jun 2006 23:12:34 -0000 1.12
+++ info/Makefile.am 21 Jun 2006 08:08:33 -0000
@@ -19,9 +19,14 @@
 localedir = $(datadir)/locale
 infodir2 = $(datadir)/info
 
-AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-DEFS =  -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
-        -DINFODIR2=\"$(infodir2)\"
+AM_CPPFLAGS =                                  \
+  -I$(top_srcdir)                              \
+  -I$(top_srcdir)/gnulib/lib                   \
+  -I$(top_builddir)/gnulib/lib                 \
+  -DLOCALEDIR=\"$(localedir)\"                         \
+  -DINFODIR=\"$(infodir)\"                     \
+  -DINFODIR2=\"$(infodir2)\"
+
 LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a \
         $(TERMLIBS) $(LIBINTL)
 infokey_LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/Makefile.am,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.am
--- lib/Makefile.am 18 Jun 2006 23:39:43 -0000 1.9
+++ lib/Makefile.am 21 Jun 2006 08:08:33 -0000
@@ -12,8 +12,10 @@
 
 noinst_LIBRARIES = libtxi.a
 
-AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+AM_CPPFLAGS = -I$(top_srcdir)                  \
+  -I$(top_srcdir)/gnulib/lib                   \
+  -I$(top_builddir)/gnulib/lib                 \
+  -DLOCALEDIR=\"$(localedir)\"
 
 libtxi_a_SOURCES = substring.c system.h xexit.c
 
Index: makeinfo/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/Makefile.am,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile.am
--- makeinfo/Makefile.am 19 Jun 2006 23:12:34 -0000 1.8
+++ makeinfo/Makefile.am 21 Jun 2006 08:08:33 -0000
@@ -13,8 +13,11 @@
 bin_PROGRAMS = makeinfo
 
 localedir = $(datadir)/locale
-AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-DEFS = -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS =                                  \
+  -I$(top_srcdir)                              \
+  -I$(top_srcdir)/gnulib/lib                   \
+  -I$(top_builddir)/gnulib/lib                 \
+  -DLOCALEDIR=\"$(localedir)\"
 LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
 makeinfo_SOURCES = \
Index: util/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.24
diff -u -u -r1.24 Makefile.am
--- util/Makefile.am 19 Jun 2006 23:12:34 -0000 1.24
+++ util/Makefile.am 21 Jun 2006 08:08:33 -0000
@@ -27,8 +27,11 @@
 transform = s/ginstall-info/install-info/; $(program_transform_name)
 
 localedir = $(datadir)/locale
-AM_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-DEFS = -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS =                                  \
+  -I$(top_srcdir)                              \
+  -I$(top_srcdir)/gnulib/lib                   \
+  -I$(top_builddir)/gnulib/lib                 \
+  -DLOCALEDIR=\"$(localedir)\"
 LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
 dist_pkgdata_DATA = texinfo.dtd texinfo.xsl