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

diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 69370d7..2a58b8b
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ MKDIR=mkdir -p
 links:
 	# documentation
 	$(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/
-	$(LN) doc/{LICENSE*,TODO,changelog*} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/
+	$(LN) doc/{TODO,changelog.html} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/
 	$(LN) doc/source/html/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/
 	
 	# images
@@ -51,17 +51,15 @@ links:
 	$(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
-	chmod 664 $(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
 	
 	# i18n
 	if [ ! -d $(DESTDIR)/usr/share/iserv/locale/de/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/locale/de/; fi
 	$(LN) lang/*.po $(DESTDIR)/usr/share/iserv/locale/de/
 	
 	# navigation
-	if [ ! -d $(DESTDIR)/usr/share/iserv/www/nav/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/nav/; fi
+	if [ ! -d $(DESTDIR)/usr/share/iserv/www/nav/admin ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/nav/admin; fi
 	$(LN) nav/*.mod $(DESTDIR)/usr/share/iserv/www/nav/
-	$(LN) nav/admin/*.mod $(DESTDIR)/usr/share/iserv/www/nav/admin
+	$(LN) nav/admin/*.mod $(DESTDIR)/usr/share/iserv/www/nav/admin/
 	
 	# privileges
 	if [ ! -d $(DESTDIR)/usr/share/iserv/priv/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/priv/; fi
@@ -80,7 +78,7 @@ links:
 	# additional files
 	$(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation
 	$(LN) update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation
-	chmod 755 $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl
+	chmod +x $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl
 
 # build doxygen documentation from source
 sourcedoc:
@@ -88,9 +86,14 @@ 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
 	chkdb -r
 	chkpriv
 	chklocale
+endif
 
 # uninstalling
 uninstall:
@@ -117,5 +120,8 @@ uninstall:
 
 # clean up
 clean: distclean
+
 distclean:
 	$(RM) doc/source
+
+.PHONY: clean