diff options
| author | Eugene V. Lyubimkin <jackyf@debian.org> | 2012-09-01 14:29:59 +0300 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:31 +0200 |
| commit | d8bd1d8d45f42b28bd4674a5e88d0aa349f887c3 (patch) | |
| tree | 5b45d0f6db97815e4bd5c80f990d8697b7228cad | |
| parent | d165403c2f0ace1f96704763327e7a7c63893bae (diff) | |
| download | debian_htop-d8bd1d8d45f42b28bd4674a5e88d0aa349f887c3.tar.gz debian_htop-d8bd1d8d45f42b28bd4674a5e88d0aa349f887c3.tar.bz2 debian_htop-d8bd1d8d45f42b28bd4674a5e88d0aa349f887c3.zip | |
Imported Debian patch 1.0.1-4debian/1.0.1-4
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 7f71396..7ae3823 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ +htop (1.0.1-4) unstable; urgency=low + + * debian/rules: + - Retrieve and pass also CPPFLAGS and LDFLAGS. Patch by Simon Ruderich. + (Closes: #685670) + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 01 Sep 2012 14:29:59 +0300 + htop (1.0.1-3) unstable; urgency=low * debian/rules: - Retrieve CFLAGS from dpkg-buildflags as dpkg-buildpackage stopped to - export them. (Closes: #685670) + export them. Thanks to Felix Geyer and Cyril Brulebois. + (Closes: #685670) * debian/control: - Build-depend on dpkg (>= 1.16.1) for using dpkg-buildflags. diff --git a/debian/rules b/debian/rules index 3cc13f0..cb65c8a 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,8 @@ else endif CFLAGS = $(shell dpkg-buildflags --get CFLAGS) +CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) config.status: configure $(QUILT_STAMPFN) dh_testdir @@ -31,7 +33,7 @@ config.status: configure $(QUILT_STAMPFN) [ ! -r /usr/share/misc/config.guess ] || \ cp -f /usr/share/misc/config.guess config.guess - CFLAGS="$(CFLAGS)" LDFLAGS="$(INSTALL_PROGRAM)" ./configure \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) $(INSTALL_PROGRAM)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ |