documentation: Makefile puts sourcedoc in doc/source, installs everything in /usr...

diff --git a/Makefile b/Makefile
index 410d622..f639d30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,9 @@ links:
        # documentation\r
        $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
        $(LN) doc/{TODO,changelog.html} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/\r
        # documentation\r
        $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
        $(LN) doc/{TODO,changelog.html} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/\r

-       $(LN) doc/source/html/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
-       \r
+       $(LN) doc/source/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
+       $(LN) -s $(DESTDIR)/usr/share/doc/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
        # 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


@@ -87,6 +88,7 @@ endif
 # build doxygen documentation from source\r
 sourcedoc:\r
        doxygen\r
 # build doxygen documentation from source\r
 sourcedoc:\r
        doxygen\r

+       mv doc/source/html/* doc/source/ && rm -rf doc/source/html\r

 \r
 # install everything\r
 install: sourcedoc links\r
 \r
 # install everything\r
 install: sourcedoc links\r

diff --git a/debian/postinst b/debian/postinst
index 9e56694..16b6a14 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,5 +4,5 @@ chgrp www-data /usr/share/iserv/www/inc/mod_room-reservation/config.inc
 chkdb -r
 chkpriv
 chklocale
 chkdb -r
 chkpriv
 chklocale

-
+ln -fs /usr/share/doc/iserv/mod/room-reservation /usr/share/doc/iserv-mod-room-reservation

 #DEBHELPER#
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
index ebcf0f6..9a88844 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ binary-indep:
        dh_testdir
        dh_testroot
        dh_installchangelogs 
        dh_testdir
        dh_testroot
        dh_installchangelogs 

-       dh_installdocs
+       dh_installdocs doc/{changelog.html,TODO} doc/source/

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