X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=0e08d9585a6edefa07b0f9f070201f1a6879e919;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=e94b1fa216661a64f5083adfc6ecff0f985650b1;hpb=883183d05fc355a22f2c4b69d54029518df6840f;p=metaproxy-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index e94b1fa..0e08d95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,34 +6,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Force compat level five
-export DH_COMPAT=5
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-yazpp=/usr/bin --without-usemarcon
-
-#--infodir=\$${prefix}/share/info --enable-shared --enable-static --with-xslt
-
+	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--with-yazpp=/usr/bin --without-usemarcon \
+		--prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status