Makefile: documentation is deleted on uninstall, some small changes. Documentation...

diff --git a/Makefile b/Makefile
index 39153a6..c1de84b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,11 +33,12 @@ MKDIR=mkdir -p
 links: sourcedoc\r
        # documentation\r
        $(MKDIR) $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/source/\r
+       if [ ! -d $(DESTDIR)/usr/share/doc/iserv/mod/ ]; then $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/; fi\r
        $(LN) doc/{TODO,changelog.old.html} $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/\r
        $(LN) doc/source/* $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/source/\r
        $(RM) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation\r
-       $(LN) -s $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation\r
-\r
+       $(LN) -s ../../iserv-mod-room-reservation $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation\r
+       \r
        # images\r
        if [ ! -d $(DESTDIR)/usr/share/iserv/www/img/default/16/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/img/default/16/; fi\r
        $(LN) img/16/*.png $(DESTDIR)/usr/share/iserv/www/img/default/16/\r
@@ -50,7 +51,7 @@ links: sourcedoc
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation\r
        $(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/\r
        if [ ! -e $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc ] ; then touch $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc; fi\r
-ifeq ($(shell id -u),0)\r
+ifeq ($(USER),root)\r
        chmod g+w $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
        chown www-data $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
 endif\r
@@ -89,7 +90,7 @@ sourcedoc:
 \r
 # install everything\r
 install: links\r
-ifeq ($(shell echo $USER),root)\r
+ifeq ($(USER),root)\r
        chkdb -r\r
        chkpriv\r
        chklocale\r
@@ -97,7 +98,8 @@ endif
 \r
 # uninstalling\r
 uninstall:\r
-       $(RM) $(DESTDIR)/usr/share/doc/iserv/mod/mod_room-reservation\r
+       $(RM) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation\r
+       $(RM) $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation\r
        $(RM) $(DESTDIR)/usr/share/iserv/locale/de/mod_room-reservation.po\r
        $(RM) $(DESTDIR)/usr/share/iserv/db/mod_room-reservation.sql\r
        $(RM) $(DESTDIR)/usr/share/iserv/db/log_module/mod_room-reservation\r
@@ -124,4 +126,4 @@ clean: distclean
 distclean:\r
        $(RM) doc/source\r
 \r
-.PHONY: clean distclean\r
+.PHONY: clean distclean install\r

diff --git a/debian/postinst b/debian/postinst
index 6e96da0..f5e9b4d 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,5 +5,4 @@ chgrp www-data /usr/share/iserv/www/inc/mod_room-reservation/config.inc
 chkdb -r
 chkpriv
 chklocale
-ln -fs /usr/share/doc/iserv-mod-room-reservation /usr/share/doc/iserv/mod/room-reservation
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
index 51fc4a8..2128ee6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,9 @@ binary-indep:
        dh_clean -k 
        dh_installdirs
        $(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