Makefile: added distclean to phony targets, documentation is installed in /usr/share...

[iserv-mod-room-reservation.git] / Makefile

diff --git a/Makefile b/Makefile
index 9440ef6..39153a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,20 +25,19 @@
 #\r
 \r
 DESTDIR?=\r
-SOURCEFILES=src/*.php includes/*.inc\r
-MODULE_DOC_FILES=doc/source/html/* doc/source/latex/*\r
 LN=ln -f\r
 RM=rm -rf\r
 MKDIR=mkdir -p\r
 \r
 # hardlink the files to their destinations\r
-# TODO move documentation where Jörg wants it ;)\r
-links:\r
+links: sourcedoc\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
+       $(MKDIR) $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/source/\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
        # 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
@@ -75,9 +74,8 @@ endif
        $(LN) sql/log_module/* $(DESTDIR)/usr/share/iserv/db/log_module\r
        \r
        # web pages\r
-       $(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin\r
-       $(LN) src/index.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/\r
-       $(LN) src/admin/config.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin/\r
+       $(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation\r
+       $(LN) src/{config,index}.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/\r
        \r
        # additional files\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
@@ -87,9 +85,10 @@ endif
 # 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
+install: links\r
 ifeq ($(shell echo $USER),root)\r
        chkdb -r\r
        chkpriv\r
@@ -125,4 +124,4 @@ clean: distclean
 distclean:\r
        $(RM) doc/source\r
 \r
-.PHONY: clean\r
+.PHONY: clean distclean\r