Use dpkg-buildflags in build process

[idzebra-moved-to-github.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 956eaf2..e833251 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,29 +11,31 @@
 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 --with-tclconfig=/usr/lib/tcl8.4
+       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 --enable-static \
+               --with-yaz=/usr/bin \
+               --with-tclconfig=/usr/lib/tcl8.4 \
+               --prefix=/usr
 
 build: build-stamp
 build-stamp:  config.status
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE)
+       $(MAKE) 
 
        touch build-stamp
 
@@ -45,13 +47,12 @@ clean:
        # Add here commands to clean up after the build process.
        -$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       if [! -f config.sub] ; then cp -f /usr/share/misc/config.sub config.sub ; fi
+       if test ! -f config.sub; then cp -f /usr/share/misc/config.sub config.sub ; fi
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       if [! -f config.guess] ; then cp -f /usr/share/misc/config.guess config.guess ; fi
+       if test ! -f config.guess ; then cp -f /usr/share/misc/config.guess config.guess ; fi
 endif
 
-
        dh_clean 
 
 install: build
@@ -75,7 +76,6 @@ binary-arch: build install
        dh_installchangelogs 
        dh_installdocs
        dh_installexamples
-       mv debian/tmp/usr/share/doc/idzebra debian/tmp/usr/share/doc/idzebra-doc
        dh_install --sourcedir=debian/tmp
 #      dh_installmenu
 #      dh_installdebconf       
@@ -93,9 +93,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libidzebra1.4 (>= 1.4.0)' -X mod-
+       dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.20)' -X mod-
        dh_installdeb
-       dh_shlibdeps -l debian/libidzebra1.4/usr/lib
+       dh_shlibdeps -L libidzebra-2.0 -l debian/libidzebra-2.0/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb