Merge branch 'master' of ssh://razzor@kopf-tisch.de/home/razzor/public_git/sammler

This commit is contained in:
Olaf Rempel 2009-04-19 18:29:06 +02:00
commit 22958bb820
1 changed files with 4 additions and 3 deletions

View File

@ -71,13 +71,14 @@ install: all
$(DESTDIR)$(CONFIG_DIR)/sammler.conf
install -d -m 755 $(DESTDIR)$(PLUGIN_DIR)
install -m 755 -s plugins/*.so $(DESTDIR)$(PLUGIN_DIR)
install -d -m 755 $(DESTDIR)$(DATA_DIR) $(DESTDIR)$(LOG_DIR)
install -d -m 755 $(DESTDIR)$(LOG_DIR)
ifeq ("$(WITH_RRD)", "yes")
install -d -m 755 $(DESTDIR)$(DATA_DIR)
install -D -m 644 sammler.php $(DESTDIR)$(WWW_DIR)/sammler.php
sed -i -e "s:%%WWW_CONFIG%%:$(WWW_CONFIG):" \
-e "s:%%DATA_DIR%%:$(DATA_DIR):" \
-e "s:%%DATA_DIR%%:$(DATA_DIR)/:" \
$(DESTDIR)$(WWW_DIR)/sammler.php
-install -D -m 644 -o $(WWW_OWNER) /dev/null $(DESTDIR)$(WWW_CONFIG)
else