chiark / gitweb /
vars.am: Fix include path tweaking.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 16 Oct 2012 19:08:37 +0000 (20:08 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 16 Oct 2012 19:08:37 +0000 (20:08 +0100)
For some reason, the include directories were set in CPPFLAGS rather
than AM_CPPFLAGS, which is just a mistake.

Also, astonishingly, the makefile botched adding $(top_builddir)/config
to the include path.  This obviously never worked.  Fortunately,
Automake magically included the correct path by itself, so just remove
the embarrassing mistake and pretend it never happened.

vars.am

diff --git a/vars.am b/vars.am
index 5a9938d6bc82ff656f1cc2d3eb030f514e1cc330..251a20589d2920c2f40c8dbd67550446164e1a44 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -38,11 +38,10 @@ SUFFIXES             =
 ### Include path.
 
 TRIPE_INCLUDES = \
-       -I$(top_builddir)/config.h \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/priv
 
-CPPFLAGS += $(TRIPE_INCLUDES)
+AM_CPPFLAGS += $(TRIPE_INCLUDES)
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.