From 72814a4974d2bfe72ff8487426dcd46096fd3886 Mon Sep 17 00:00:00 2001 From: rohieb Date: Wed, 23 Jul 2008 04:50:11 +0200 Subject: [PATCH] Makefile: moved all root-related stuff to install target --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b4a19c6..5ddf5b6 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,6 @@ 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 @@ -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,7 +86,10 @@ sourcedoc: # install everything install: sourcedoc links -ifeq($(DESTDIR),) # only useful if sql data is in the right place +ifdef $(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 @@ -119,5 +120,8 @@ uninstall: # clean up clean: distclean + distclean: $(RM) doc/source + +.PHONY: clean -- 2.20.1