From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 16 Oct 2012 19:08:37 +0000 (+0100)
Subject: vars.am: Fix include path tweaking.
X-Git-Tag: 1.0.0pre11.1~4
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/bac6ffe41f5d1221ecacba49947094b0571fb44c

vars.am: Fix include path tweaking.

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.
---

diff --git a/vars.am b/vars.am
index 5a9938d6..251a2058 100644
--- 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.