rename CPPFLAGS to AM_CPPFLAGS to allow CPPFLAGS overrides [Rainer Orth]

diff --git a/Makefile.am b/Makefile.am
index 8e868cd2b20f3efb33b139f7297c7fccf78c232b..2cbd860ffe5426b7d14d012e14f374152a0c920d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = file
 data_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 MAGIC   = @datadir@/magic
-CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 
 if FSECT5
 man_MAGIC = magic.5

diff --git a/Makefile.in b/Makefile.in
index 70dfd5e7eb9282ebe79ab35c6e4e694b9089b8ad..3e7f03a258175521ec0ca3211d2bb713687f34e0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,7 +72,7 @@ bin_PROGRAMS = file
 data_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 MAGIC = @datadir@/magic
-CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 @FSECT5_TRUE@man_MAGIC = @FSECT5_TRUE@magic.5
 @FSECT5_FALSE@man_MAGIC = @FSECT5_FALSE@magic.4
 fsect = @fsect@
@@ -255,6 +255,7 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 file_OBJECTS =  file.o apprentice.o fsmagic.o softmagic.o ascmagic.o \