From 03a96541958129408450bcdc624fed57ba186238 Mon Sep 17 00:00:00 2001 From: rohieb Date: Sat, 26 Jul 2008 21:18:21 +0200 Subject: [PATCH] documentation: Makefile puts sourcedoc in doc/source, installs everything in /usr/share/doc/iserv-mod-room-reservation and symlinks it to /usr/share/iserv/mod/room-reservation, same in debian/postinst. debian/rules uses dh_installdocs. --- Makefile | 6 ++++-- debian/postinst | 2 +- debian/rules | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 410d622..f639d30 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,9 @@ links: # documentation $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/ $(LN) doc/{TODO,changelog.html} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/ - $(LN) doc/source/html/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/ - + $(LN) doc/source/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/ + $(LN) -s $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation + # images if [ ! -d $(DESTDIR)/usr/share/iserv/www/img/default/16/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/img/default/16/; fi $(LN) img/16/*.png $(DESTDIR)/usr/share/iserv/www/img/default/16/ @@ -87,6 +88,7 @@ endif # build doxygen documentation from source sourcedoc: doxygen + mv doc/source/html/* doc/source/ && rm -rf doc/source/html # install everything install: sourcedoc links diff --git a/debian/postinst b/debian/postinst index 9e56694..16b6a14 100755 --- 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 - +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 ebcf0f6..9a88844 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ binary-indep: dh_testdir dh_testroot dh_installchangelogs - dh_installdocs + dh_installdocs doc/{changelog.html,TODO} doc/source/ #dh_installexamples ##dh_install ##dh_installmenu -- 2.20.1