From d6e2eff899318a330b12a858a5f5c33cc6fb688f Mon Sep 17 00:00:00 2001 From: Alban Browaeys Date: Tue, 15 Jan 2013 03:01:20 +0100 Subject: [PATCH] aptcc: build - AM_CPPFLAGS is not used if per-target variable exists. Insert $(AM_CPPFLAGS) into the per-target libpk_backend_aptcc_la_ C and CPP flags. Fixes : /home/prahal/checkout/gnome/PackageKit/backends/aptcc/apt-intf.cpp: In member function 'void AptIntf::updateInterface(int, int)': /home/prahal/checkout/gnome/PackageKit/backends/aptcc/apt-intf.cpp:1751:45: error: 'DATADIR' was not declared in this scope --- backends/aptcc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backends/aptcc/Makefile.am b/backends/aptcc/Makefile.am index f5b32cd..9e3ab9a 100644 --- a/backends/aptcc/Makefile.am +++ b/backends/aptcc/Makefile.am @@ -19,8 +19,9 @@ libpk_backend_aptcc_la_SOURCES = PkgList.cpp \ pk-backend-aptcc.cpp libpk_backend_aptcc_la_LIBADD = -lcrypt -lapt-pkg -lapt-inst $(PK_PLUGIN_LIBS) libpk_backend_aptcc_la_LDFLAGS = -module -avoid-version $(APTCC_LIBS) $(GSTREAMER_LIBS) -libpk_backend_aptcc_la_CFLAGS = $(PK_PLUGIN_CFLAGS) -libpk_backend_aptcc_la_CPPFLAGS = $(PK_PLUGIN_CFLAGS) $(APTCC_CFLAGS) $(GSTREAMER_CFLAGS) +libpk_backend_aptcc_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(AM_CPPFLAGS) +libpk_backend_aptcc_la_CPPFLAGS = $(PK_PLUGIN_CFLAGS) $(APTCC_CFLAGS) $(GSTREAMER_CFLAGS) \ + $(AM_CPPFLAGS) aptconfdir = ${SYSCONFDIR}/apt/apt.conf.d aptconf_DATA = 20packagekit -- 1.8.1