X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=debian%2Frules;h=10d3b5652f68b5dca207f738618cab923e31348e;hp=1c3f33b66a5fe86cb8bf0165358349d212b7796d;hb=da5e82516b0b66ec65e6af4779f2fdbf29d42e5e;hpb=d03cfd1f6a2a85807e72b58b36a47e3f1000cc2b

diff --git a/debian/rules b/debian/rules
index 1c3f33b..10d3b56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,38 +6,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # 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
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
+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-xml2=/usr
-
+	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
@@ -84,14 +73,11 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	cp LICENSE debian/copyright
-	cp LICENSE.proxy debian/libyazproxy.copyright
-	cp LICENSE.proxy debian/libyazproxy-dev.copyright
-	cp LICENSE.proxy debian/yazproxy.copyright
 	dh_installdocs -A README
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installexamples
-	mv debian/tmp/usr/share/doc/yaz++ debian/tmp/usr/share/doc/yaz++-doc
+	mv debian/tmp/usr/share/doc/yazpp debian/tmp/usr/share/doc/yazpp-doc
 	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
@@ -109,9 +95,9 @@ binary-arch: build install
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libyaz++ (>= 0.7.13)'
+	dh_makeshlibs -V 'libyazpp5 (>= 1.4.0)'
 	dh_installdeb
-	dh_shlibdeps -l debian/libyaz++/usr/lib:debian/libyazproxy/usr/lib
+	dh_shlibdeps -l debian/libyazpp5/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb