explicitly set the module for log_insert(), SQL table is updated automagically on...

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

diff --git a/Makefile b/Makefile
index c006596..2a4fc00 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-#\r
 # @file Makefile\r
-# Makefile for installing, creating documentation etc\r
+# Makefile for installing, creating documentation etc.\r
 # @author: Roland Hieber (roland.hieber@wilhelm-gym.net)\r
 # @date: 12.11.2007\r
 # \r
@@ -57,9 +56,13 @@ links:
        $(LN) sql/*.sql /usr/share/iserv/db/\r
        \r
        $(MKDIR) /usr/share/iserv/www/mod_room-reservation/admin\r
-       $(LN) src/{index.php,stat.png.php} /usr/share/iserv/www/mod_room-reservation/\r
+       $(LN) src/index.php /usr/share/iserv/www/mod_room-reservation/\r
        $(LN) src/admin/config.php /usr/share/iserv/www/mod_room-reservation/admin/\r
 \r
+       $(MKDIR) /usr/share/iserv/modules/room-reservation\r
+       $(LN) update-iserv1-iserv2.pl /usr/share/iserv/modules/room-reservation\r
+       chmod 755 /usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r
+\r
 # build doxygen documentation from source\r
 sourcedoc:\r
        doxygen\r
@@ -68,12 +71,6 @@ sourcedoc:
 install: sourcedoc links\r
        chkdb -r\r
        chkpriv\r
-       \r
-       @if [ -z "`psql -qc "SELECT * FROM log_module;" 2>&1 |grep ERROR`" -a -z \\r
-         "`psql -qc \"SELECT COUNT(*) FROM log_module WHERE module = 'Room Reservation Schedule';\" 2>&1 |grep ' 1'`" ]; then \\r
-         echo psql -c "INSERT INTO log_module VALUES('Room Reservation Schedule');"; \\r
-         psql -c "INSERT INTO log_module VALUES('Room Reservation Schedule');"; \\r
-       fi;\r
        chklocale\r
 \r
 # uninstalling\r
@@ -87,12 +84,12 @@ uninstall:
        $(RM) /usr/share/iserv/www/img/default/{16,24,32}/mod_room-reservation_{timeslice,index,config}.png\r
        $(RM) /usr/share/iserv/www/inc/mod_room-reservation\r
        $(RM) /usr/share/iserv/www/mod_room-reservation\r
+       $(RM) /usr/share/iserv/modules/room-reservation\r
        \r
        chklocale\r
        \r
        @echo ----------------------------------------------------------------------\r
        @echo If you do not need the SQL tables anymore, remove them by running\r
-       @echo '  psql -c "DROP TABLE mod_room-reservation;"'\r
-       @echo '  psql -c "DROP SEQUENCE mod_room-reservation_rr_uid_seq;"'\r
+       @echo '  psql -c "DROP TABLE mod_roomreservation_bookings;"'\r
        @echo After that, all bookings are unrecoverably deleted!\r
        @echo ----------------------------------------------------------------------\r