summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2017-03-31 05:53:00 +0200
committerGuillem Jover <guillem@debian.org>2017-05-20 05:21:33 +0200
commit7fd3dc1d6aed1c1a8a6bbe783d982e6db6073412 (patch)
tree99f3b5720a245f7128b673d94370108fc2122274
parent449adb2959642f8a10729a0cbf6eedf0cc4441b2 (diff)
downloaddpkg-7fd3dc1d6aed1c1a8a6bbe783d982e6db6073412.tar.gz
build: Do not override the default DEPENDENCIES for libdpkg
Extend it instead, to make sure that we preserve the libcompat dependency generated from LIBADD.
-rw-r--r--debian/changelog1
-rw-r--r--lib/dpkg/Makefile.am2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c988db671..20d94f18d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
- Require Perl 5.20.2, the version in Debian oldstable (jessie).
- Use new gcc-7 -Wrestrict and -Wshift-negative-value warnings if
available.
+ - Do not override the default DEPENDENCIES for libdpkg, extend it instead.
-- Guillem Jover <guillem@debian.org> Thu, 18 May 2017 05:27:31 +0200
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index b8d049ce0..215d12ffb 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -38,7 +38,7 @@ libdpkg_la_LIBADD += \
$(LZMA_LIBS) \
$(BZ2_LIBS)
endif
-libdpkg_la_DEPENDENCIES = \
+EXTRA_libdpkg_la_DEPENDENCIES = \
libdpkg.map
libdpkg_la_SOURCES = \
dlist.h \