Makefile: moved all root-related stuff to install target

diff --git a/Makefile b/Makefile
index b4a19c6..5ddf5b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,6 @@ links:
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation\r
        $(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/\r
        touch $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
-       chmod 664 $(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
        \r
        # i18n\r
        if [ ! -d $(DESTDIR)/usr/share/iserv/locale/de/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/locale/de/; fi\r
@@ -80,7 +78,7 @@ links:
        # additional files\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
        $(LN) update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
-       chmod 755 $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r
+       chmod +x $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r
 \r
 # build doxygen documentation from source\r
 sourcedoc:\r
@@ -88,7 +86,10 @@ sourcedoc:
 \r
 # install everything\r
 install: sourcedoc links\r
-ifeq($(DESTDIR),) # only useful if sql data is in the right place\r
+ifdef $(DESTDIR)\r
+# only useful if sql data is in the right place\r
+       chmod g+w $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
+       chgrp www-data $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
        chkdb -r\r
        chkpriv\r
        chklocale\r
@@ -119,5 +120,8 @@ uninstall:
 \r
 # clean up\r
 clean: distclean\r
+\r
 distclean:\r
        $(RM) doc/source\r
+\r
+.PHONY: clean\r