Makefile: chmod u+rw config.inc

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

diff --git a/Makefile b/Makefile
index 9440ef6..b847b0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,19 +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
+       $(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 ../../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
@@ -49,10 +49,10 @@ links:
        \r
        # includes\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation\r
-       $(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/\r
+       $(LN) inc/*.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
-       chmod g+w $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
+ifeq ($(USER),root)\r
+       chmod u+rw $(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
        \r
@@ -75,9 +75,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,10 +86,11 @@ 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
-ifeq ($(shell echo $USER),root)\r
+install: links\r
+ifeq ($(USER),root)\r
        chkdb -r\r
        chkpriv\r
        chklocale\r
@@ -98,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
@@ -125,4 +126,4 @@ clean: distclean
 distclean:\r
        $(RM) doc/source\r
 \r
-.PHONY: clean\r
+.PHONY: clean distclean install\r