The following commit has been merged in the master branch:
commit 5921a827603dbc938f4b283f0008e6d8a88172bc
Author: Guillem Jover <[email protected]>
Date: Sat Aug 15 20:15:47 2009 +0200
Use AM_CPPFLAGS instead of deprecated INCLUDES in Makefile.am files
diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am
index be15364..ee4fd1d 100644
--- a/dpkg-deb/Makefile.am
+++ b/dpkg-deb/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-idirafter $(top_srcdir)/lib/compat \
-I$(top_builddir) \
diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am
index 63d285b..724e468 100644
--- a/dpkg-split/Makefile.am
+++ b/dpkg-split/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
-idirafter $(top_srcdir)/lib/compat \
diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index 4da7082..bbd1369 100644
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -3,7 +3,7 @@
SUBDIRS = methods po
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
-DLOCALLIBDIR=\"/usr/local/lib/dpkg\" \
diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am
index c95f937..7d362d5 100644
--- a/lib/compat/Makefile.am
+++ b/lib/compat/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = \
+AM_CPPFLAGS = \
-idirafter $(top_srcdir)/lib/compat
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index 7d20fd2..defa80d 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = test
localedir = $(datadir)/locale
pkgconfdir = $(sysconfdir)/@PACKAGE@
-INCLUDES = \
+AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-DCONFIGDIR=\"$(pkgconfdir)\" \
-DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \
diff --git a/lib/dpkg/test/Makefile.am b/lib/dpkg/test/Makefile.am
index 076e855..a65cc76 100644
--- a/lib/dpkg/test/Makefile.am
+++ b/lib/dpkg/test/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = \
+AM_CPPFLAGS = \
-idirafter $(top_srcdir)/lib/compat \
-I$(top_builddir) \
-I$(top_srcdir)/lib
diff --git a/src/Makefile.am b/src/Makefile.am
index 42b0a63..1f754aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-DADMINDIR=\"$(admindir)\" \
-idirafter $(top_srcdir)/lib/compat \
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 156ccca..b342395 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-idirafter $(top_srcdir)/lib/compat \
-I$(top_builddir) \
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
