summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2019-01-13 22:12:01 -0400
committerDavid Bremner <david@tethera.net>2019-01-13 22:21:02 -0400
commit014fa8c3e2cae428ed8b0cb32bc89e1dbc8fb9a9 (patch)
tree282acbd9840f1547f1c73f587d547f1b72346ffd
parent2f183600234d73795c24f0c3a394377e535f49d2 (diff)
Pass cflags from dpkg-buildflags to make
Among other things, this (mostly) repairs the dbgsym packages
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules4
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 8a64b1b..097ae62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
lrslib (0.70-3) unstable; urgency=medium
* upload to unstable
+ * pass CFLAGS from dpkg-buildflags to make (fix generation of dbgsym
+ packages)
- -- David Bremner <bremner@debian.org> Sun, 13 Jan 2019 22:00:52 -0400
+ -- David Bremner <bremner@debian.org> Sun, 13 Jan 2019 22:12:46 -0400
lrslib (0.70-2) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index cdd8be5..50eaf93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ DOCBASEURL=http://cgm.cs.mcgill.ca/%7Eavis/C/lrslib/USERGUIDE.html
DB2MAN=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl
XP=xsltproc --nonet
-CFLAGS=$(shell dpkg-buildflags --get CFGLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
export CFLAGS CPPFLAGS LDFLAGS
@@ -16,7 +16,7 @@ BUILDARGS=
endif
override_dh_auto_build: lrslib.1 nash.1
- make prefix=/usr DESTDIR=$(CURDIR)/debian/tmp $(BUILDARGS) all-shared
+ make prefix=/usr DESTDIR=$(CURDIR)/debian/tmp CFLAGS="$(CFLAGS)" $(BUILDARGS) all-shared
override_dh_auto_install:
make prefix=/usr DESTDIR=$(CURDIR)/debian/tmp $(BUILDARGS) install