summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/Makefile.am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-16 11:52:12 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-16 11:52:12 +0000
commit351b5fe3106e281bf9269440e6270dc1b56635f5 (patch)
tree29d6be38592c9384cec27797b3ea3560730adfd6 /Build/source/libs/poppler/Makefile.am
parent361ad3a3d62671dd95699b6fc55d6cbb79424811 (diff)
icu: build fix for gcc-4.7
tardate 2012-11-16 libs/*: avoid use of deprecated 'INCLUDES'. git-svn-id: svn://tug.org/texlive/trunk@28277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/poppler/Makefile.am')
-rw-r--r--Build/source/libs/poppler/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 51bc686c3b4..9053425f09b 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -30,8 +30,8 @@ GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo
FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi
POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler
-INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES)
-AM_CPPFLAGS = -DPOPPLER_DATADIR='"."'
+AM_CPPFLAGS = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES)
+AM_CPPFLAGS += -DPOPPLER_DATADIR='"."'
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)