mod_roomReservationRoomsManager: added getRoomByName() and getRoomByOid()

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

diff --git a/Makefile b/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 69370d7..a90f49a
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ MKDIR=mkdir -p
 links:\r
        # documentation\r
        $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
 links:\r
        # documentation\r
        $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r

-       $(LN) doc/{LICENSE*,TODO,changelog*} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/\r
+       $(LN) doc/{TODO,changelog.html} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/\r

        $(LN) doc/source/html/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
        \r
        # images\r
        $(LN) doc/source/html/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/\r
        \r
        # images\r


@@ -50,18 +50,20 @@ links:
        # includes\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation\r
        $(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/\r
        # includes\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation\r
        $(LN) includes/*.inc $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/\r

-       touch $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
-       chmod 664 $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
+       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\r
+ifeq ($(shell id -u),0)\r
+       chmod g+w $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r

        chown www-data $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r
        chown www-data $(DESTDIR)/usr/share/iserv/www/inc/mod_room-reservation/config.inc\r

+endif\r

        \r
        # i18n\r
        if [ ! -d $(DESTDIR)/usr/share/iserv/locale/de/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/locale/de/; fi\r
        $(LN) lang/*.po $(DESTDIR)/usr/share/iserv/locale/de/\r
        \r
        # navigation\r
        \r
        # i18n\r
        if [ ! -d $(DESTDIR)/usr/share/iserv/locale/de/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/locale/de/; fi\r
        $(LN) lang/*.po $(DESTDIR)/usr/share/iserv/locale/de/\r
        \r
        # navigation\r

-       if [ ! -d $(DESTDIR)/usr/share/iserv/www/nav/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/nav/; fi\r
+       if [ ! -d $(DESTDIR)/usr/share/iserv/www/nav/admin ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/www/nav/admin; fi\r

        $(LN) nav/*.mod $(DESTDIR)/usr/share/iserv/www/nav/\r
        $(LN) nav/*.mod $(DESTDIR)/usr/share/iserv/www/nav/\r

-       $(LN) nav/admin/*.mod $(DESTDIR)/usr/share/iserv/www/nav/admin\r
+       $(LN) nav/admin/*.mod $(DESTDIR)/usr/share/iserv/www/nav/admin/\r

        \r
        # privileges\r
        if [ ! -d $(DESTDIR)/usr/share/iserv/priv/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/priv/; fi\r
        \r
        # privileges\r
        if [ ! -d $(DESTDIR)/usr/share/iserv/priv/ ]; then $(MKDIR) $(DESTDIR)/usr/share/iserv/priv/; fi\r


@@ -79,8 +81,8 @@ links:
        \r
        # additional files\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
        \r
        # additional files\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation\r

-       $(LN) update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
-       chmod 755 $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r
+       $(LN) maint/update-iserv1-iserv2.pl $(DESTDIR)/usr/share/iserv/modules/room-reservation\r
+       chmod +x $(DESTDIR)/usr/share/iserv/modules/room-reservation/update-iserv1-iserv2.pl\r

 \r
 # build doxygen documentation from source\r
 sourcedoc:\r
 \r
 # build doxygen documentation from source\r
 sourcedoc:\r


@@ -88,9 +90,11 @@ sourcedoc:
 \r
 # install everything\r
 install: sourcedoc links\r
 \r
 # install everything\r
 install: sourcedoc links\r

+ifeq ($(shell id -u),0)\r

        chkdb -r\r
        chkpriv\r
        chklocale\r
        chkdb -r\r
        chkpriv\r
        chklocale\r

+endif\r

 \r
 # uninstalling\r
 uninstall:\r
 \r
 # uninstalling\r
 uninstall:\r


@@ -117,5 +121,8 @@ uninstall:
 \r
 # clean up\r
 clean: distclean\r
 \r
 # clean up\r
 clean: distclean\r

+\r

 distclean:\r
        $(RM) doc/source\r
 distclean:\r
        $(RM) doc/source\r

+\r
+.PHONY: clean\r