X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=debian%2Frules;h=390a83f6fc5c4d47141eac5be194e8b24dc15c06;hp=160c4f22250574f9b4a118b11610bc7802885716;hb=c3ff843e467932c6027a8b3b2ebda7b44612447e;hpb=053934ce0725900e24f11a97232f19dd6f1c5dc3

diff --git a/debian/rules b/debian/rules
index 160c4f2..390a83f 100755
--- 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) -j8
+	$(MAKE) 
 
 	touch build-stamp
 
@@ -43,15 +45,14 @@ clean:
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) -j8 distclean
+	-$(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
@@ -61,7 +62,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	$(MAKE) -j8 install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 
 # Build architecture-independent files here.
@@ -78,23 +79,23 @@ binary-arch: build install
 	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
 #	dh_installdebconf	
-#	dh_installlogrotate
+	dh_installlogrotate --name=zebrasrv
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-#	dh_installinit
+	dh_installinit --name=zebrasrv
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=idzebra-2.0-dbg
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.0)' -X mod-
+	dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.20)' -X mod-
 	dh_installdeb
-	dh_shlibdeps -l debian/libidzebra-2.0/usr/lib
+	dh_shlibdeps -L libidzebra-2.0 -l debian/libidzebra-2.0/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb