Makefile: merged

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

diff --git a/Makefile b/Makefile
index c9bf658..a90f49a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ endif
        \r
        # additional files\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
        \r
        # 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
+       $(LN) maint/update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation\r

        chmod +x $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r
 \r
 # build doxygen documentation from source\r
        chmod +x $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r
 \r
 # build doxygen documentation from source\r


@@ -91,8 +91,6 @@ sourcedoc:
 # install everything\r
 install: sourcedoc links\r
 ifeq ($(shell id -u),0)\r
 # install everything\r
 install: sourcedoc links\r
 ifeq ($(shell id -u),0)\r

-       chmod g+w $(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

        chkdb -r\r
        chkpriv\r
        chklocale\r
        chkdb -r\r
        chkpriv\r
        chklocale\r