X-Git-Url: https://git.rohieb.name/iserv-mod-room-reservation.git/blobdiff_plain/030ca48b6234e0e7e8ef1237e642344b9cebf78f..17a81109286e0e7a83bc662d9710c79ba4c0315c:/Makefile

diff --git a/Makefile b/Makefile
index 2a58b8b..a90f49a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,11 @@ links:
 	# includes
 	$(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation
 	$(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/
-	touch $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc
+	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
+ifeq ($(shell id -u),0)
+	chmod g+w $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc
+	chown www-data $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc
+endif
 	
 	# i18n
 	if [ ! -d $(DESTDIR)/usr/share/iserv/locale/de/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/locale/de/; fi
@@ -77,7 +81,7 @@ links:
 	
 	# additional files
 	$(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation
-	$(LN) update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation
+	$(LN) maint/update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation
 	chmod +x $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl
 
 # build doxygen documentation from source
@@ -86,10 +90,7 @@ sourcedoc:
 
 # install everything
 install: sourcedoc links
-ifndef $(DESTDIR)
-# only useful if sql data is in the right place
-	chmod g+w $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc
-	chgrp www-data $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc
+ifeq ($(shell id -u),0)
 	chkdb -r
 	chkpriv
 	chklocale