X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcacti;h=9862cfeb1744141d467026f829888f811dd7a5e2;hp=0771d7582e530974e17ccd6ca7a6c79de365d55f;hb=4a2a1232c7deba53bb48c6df69d95631dc19b95e;hpb=5c53e7303442df08cb3eea8d4ba298c39bde610c

diff --git a/lfs/cacti b/lfs/cacti
index 0771d7582e..9862cfeb17 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -78,18 +78,20 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	@rm -rf /usr/share/cacti
-	mkdir /usr/share/cacti
+	@rm -rf /var/cacti /usr/share/cacti
+	mkdir -pv /var/cacti /usr/share/cacti
+
 	cd $(DIR_APP) && mv -vf * /usr/share/cacti
 	cp -vf $(DIR_SRC)/config/cacti/cacti.conf /etc/httpd/conf/vhosts.d/
 	install -v -m 755 $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/cacti.cron
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/cacti \
 	                 /var/ipfire/backup/addons/includes/cacti
-	mkdir /var/cacti && mkdir /var/cacti/rra && mkdir /var/cacti/log 
+
 	mv -vf /usr/share/cacti/log /var/cacti
 	mv -vf /usr/share/cacti/rra /var/cacti
 	ln -s /var/cacti/log /usr/share/cacti/log
 	ln -s /var/cacti/rra /usr/share/cacti/rra
+
 	chown -R nobody:nobody /var/cacti/rra /var/cacti/log
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)