X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=f6c395241cce6768024c943e9c3a45776844db94;hb=d089fa72c83a673c788d828687dbec88fe9d1c4a;hp=4c53251d5d22ee469836dcd61d1be46dd79900e5;hpb=e92856ea4fecc1a5ea6875ad47797d462fd5fcae;p=idzebra-moved-to-github.git

diff --git a/debian/rules b/debian/rules
index 4c53251..f6c3952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ build-stamp:  config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE)
+	$(MAKE) -j8
 
 	touch build-stamp
 
@@ -43,15 +43,14 @@ clean:
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	-$(MAKE) -j8 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 +60,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -j8 install DESTDIR=$(CURDIR)/debian/tmp
 
 
 # Build architecture-independent files here.
@@ -75,12 +74,6 @@ binary-arch: build install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-
-#       moving files to correct dirs
-	mv debian/tmp/usr/share/doc/idzebra debian/tmp/usr/share/doc/idzebra2.0-doc
-	mv debian/tmp/usr/share/idzebra debian/tmp/usr/share/idzebra2.0
-	mv debian/tmp/usr/lib/idzebra debian/tmp/usr/lib/idzebra2.0
-
 	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
 #	dh_installdebconf	
@@ -98,9 +91,9 @@ binary-arch: build install
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V 'libidzebra2.0 (>= 2.0.0)' -X mod-
+	dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.0)' -X mod-
 	dh_installdeb
-	dh_shlibdeps -l debian/libidzebra2.0/usr/lib
+	dh_shlibdeps -L libidzebra-2.0 -l debian/libidzebra-2.0/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb