diff options
| author | Charles Duffy <chaduffy@cisco.com> | 2015-04-07 15:29:28 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-05-12 14:00:54 +1000 |
| commit | 1040ad4e71dc8ade4418f7de8f5d5578658638f3 (patch) | |
| tree | b0577c3d4f814428e19b4265dbec0367b1991266 | |
| parent | b0ae59724ed36242459a91c0f9c5ce036c46de41 (diff) | |
| download | pacman-1040ad4e71dc8ade4418f7de8f5d5578658638f3.tar.xz | |
Fix compilation if libarchive headers are not in standard location
With commit 097d5a478b32, including alpm.h also drags in archive.h.
Ensure the tools we build that depend on ALPM also include the necessary
flags to find libarchive headers if they are not installed in a standard
location.
[Dan: Add commit message]
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | src/pacman/Makefile.am | 3 | ||||
| -rw-r--r-- | src/util/Makefile.am | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5f103081..dc127a2b 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -19,7 +19,8 @@ AM_CPPFLAGS = \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 936d7ffb..6a89ea69 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -15,7 +15,8 @@ AM_CPPFLAGS = \ -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la |