X-Git-Url: https://git.rohieb.name/iserv-mod-room-reservation.git/blobdiff_plain/447688797a2263dcf6c8b8d1aca64ea40464dcb3..f6b2b7c137a78bb9efb05d892b675e68c5c357b4:/Makefile

diff --git a/Makefile b/Makefile
index a90f49a..a004aff 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,14 @@ 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/
-	
+	$(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 $(DESTDIR)/usr/share/doc/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
 	$(LN) img/16/*.png $(DESTDIR)/usr/share/iserv/www/img/default/16/
@@ -75,9 +77,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 +88,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 id -u),0)
+install: links
+ifeq ($(shell echo $USER),root)
 	chkdb -r
 	chkpriv
 	chklocale