moved db_user calls from includes to actual script, buggy when included from navigation

[iserv-mod-room-reservation.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 25379f0..2d79ba9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,21 +4,24 @@
 # needed for lintian
 build:
        dh_testdir
 # needed for lintian
 build:
        dh_testdir

+       rm -f dirs files

 
 binary-indep: 
 
 binary-indep: 

-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean

        dh_clean
 
        dh_testdir
        dh_testroot
        dh_clean -k 
        dh_installdirs
        dh_clean
 
        dh_testdir
        dh_testroot
        dh_clean -k 
        dh_installdirs

-       $(MAKE) DESTDIR=$(CURDIR)/debian/iserv-room-reservation install
-       
+       $(MAKE) DESTDIR=$(CURDIR)/debian/iserv-mod-room-reservation install
+
+       # we rather install the documentation via dh_installdocs
+       rm -rf $(CURDIR)/debian/iserv-mod-room-reservation/usr/share/doc/iserv-mod-room-reservation

        dh_testdir
        dh_testroot
        dh_installchangelogs 
        dh_testdir
        dh_testroot
        dh_installchangelogs 

-       dh_installdocs
+       dh_installdocs doc/changelog.old.html doc/TODO doc/source/

        #dh_installexamples
        ##dh_install
        ##dh_installmenu
        #dh_installexamples
        ##dh_install
        ##dh_installmenu


@@ -43,6 +46,7 @@ binary-indep:
        dh_gencontrol
        dh_md5sums
        dh_builddeb
        dh_gencontrol
        dh_md5sums
        dh_builddeb

+       rm -rf $(CURDIR)/debian/iserv-mod-room-reservation

 
 # needed for lintian
 binary-arch:
 
 # needed for lintian
 binary-arch:


@@ -52,8 +56,8 @@ binary: binary-indep
 clean:
        dh_testdir
        dh_testroot
 clean:
        dh_testdir
        dh_testroot

-       -$(MAKE) clean
-       dh_clean 
+       [ ! -f Makefile ] || $(MAKE) clean
+       dh_clean

 
 .PHONY: build clean binary-indep binary install
 
 
 .PHONY: build clean binary-indep binary install