X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=10d3b5652f68b5dca207f738618cab923e31348e;hb=da5e82516b0b66ec65e6af4779f2fdbf29d42e5e;hp=2507324f23928f705577b9d10bfe1f3dfb9cf23f;hpb=b33bc28aad7b21ae5c4e676bf7c65734ba522674;p=yazpp-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 2507324..10d3b56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,23 +11,22 @@
 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 --infodir=\$${prefix}/share/info --enable-shared --with-yaz=/usr/bin
-
+	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 \
+		--enable-shared --with-yaz=/usr/bin \
+		--prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status
@@ -96,9 +95,9 @@ binary-arch: build install
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libyazpp4 (>= 1.3.1)'
+	dh_makeshlibs -V 'libyazpp5 (>= 1.4.0)'
 	dh_installdeb
-	dh_shlibdeps -l debian/libyazpp4/usr/lib
+	dh_shlibdeps -l debian/libyazpp5/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb