X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcacti;h=9862cfeb1744141d467026f829888f811dd7a5e2;hb=bdc84c9f9221a31d11e364bdf28013ffc30d31a6;hp=c3cc2adbba7a6395ea0ec78f2cc0101ef21441c1;hpb=1de0aa8946cce6ab00e1f570952ddbeae01be452;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/cacti b/lfs/cacti
index c3cc2adbba..9862cfeb17 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cacti
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "netsnmpd mysql"
 
@@ -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)