X-Git-Url: https://git.rohieb.name/iserv-mod-room-reservation.git/blobdiff_plain/5a9c429536bed77958a77906b5395aadae0ef6e4..aad8ad57a1545efeda8c2888a5d85c61a7f1cbbf:/Makefile

diff --git a/Makefile b/Makefile
index 9440ef6..b847b0d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,19 +25,19 @@
 #
 
 DESTDIR?=
-SOURCEFILES=src/*.php includes/*.inc
-MODULE_DOC_FILES=doc/source/html/* doc/source/latex/*
 LN=ln -f
 RM=rm -rf
 MKDIR=mkdir -p
 
 # hardlink the files to their destinations
-# TODO move documentation where Jörg wants it ;)
-links:
+links: sourcedoc
 	# documentation
-	$(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/
-	$(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/
+	$(MKDIR) $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/source/
+	if [ ! -d $(DESTDIR)/usr/share/doc/iserv/mod/ ]; then $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/; fi
+	$(LN) doc/{TODO,changelog.old.html} $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/
+	$(LN) doc/source/* $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation/source/
+	$(RM) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation
+	$(LN) -s ../../iserv-mod-room-reservation $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation
 	
 	# images
 	if [ ! -d $(DESTDIR)/usr/share/iserv/www/img/default/16/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/img/default/16/; fi
@@ -49,10 +49,10 @@ links:
 	
 	# includes
 	$(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation
-	$(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/
+	$(LN) inc/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/
 	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
+ifeq ($(USER),root)
+	chmod u+rw $(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
 	
@@ -75,9 +75,8 @@ endif
 	$(LN) sql/log_module/* $(DESTDIR)/usr/share/iserv/db/log_module
 	
 	# web pages
-	$(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin
-	$(LN) src/index.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/
-	$(LN) src/admin/config.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin/
+	$(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation
+	$(LN) src/{config,index}.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/
 	
 	# additional files
 	$(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation
@@ -87,10 +86,11 @@ endif
 # build doxygen documentation from source
 sourcedoc:
 	doxygen
+	mv doc/source/html/* doc/source/ && rm -rf doc/source/html
 
 # install everything
-install: sourcedoc links
-ifeq ($(shell echo $USER),root)
+install: links
+ifeq ($(USER),root)
 	chkdb -r
 	chkpriv
 	chklocale
@@ -98,7 +98,8 @@ endif
 
 # uninstalling
 uninstall:
-	$(RM) $(DESTDIR)/usr/share/doc/iserv/mod/mod_room-reservation
+	$(RM) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation
+	$(RM) $(DESTDIR)/usr/share/doc/iserv-mod-room-reservation
 	$(RM) $(DESTDIR)/usr/share/iserv/locale/de/mod_room-reservation.po
 	$(RM) $(DESTDIR)/usr/share/iserv/db/mod_room-reservation.sql
 	$(RM) $(DESTDIR)/usr/share/iserv/db/log_module/mod_room-reservation
@@ -125,4 +126,4 @@ clean: distclean
 distclean:
 	$(RM) doc/source
 
-.PHONY: clean
+.PHONY: clean distclean install