X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpakfire;h=d953da54667e1ac865c1fa67f21d9c3b8658abbd;hb=2aa6d448d1f3321e0b016b58401d83da94c4fa65;hp=ff0077b72f4a4cafe9d20794e99b434939948b81;hpb=78331e301975a38f952ad9311a7ff3201e5a5e2e;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/pakfire b/lfs/pakfire
index ff0077b72f..d953da5466 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -26,6 +26,8 @@
 
 include Config
 
+VER = 0.99
+
 THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -48,13 +50,18 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && cp -fRv src/pakfire $(DIR_APP)
-	cd $(DIR_APP) && mv -vf pakfire.conf /etc
-	cd $(DIR_APP) && chown root.root $(DIR_APP) -R && chmod 755 pakfire lib/*
-	cd /opt && mkdir -p /opt/confire/paks
-	cd /opt/confire && cp -fRv $(DIR_SRC)/src/confire/* .
-	cd /opt/confire && chown root.root /opt/confire -R && chmod 755 confire /opt/confire/paks -R
+	@rm -rf $(DIR_APP)
+	-mkdir -p /opt/pakfire/{db/{meta,lists,rootfiles,installed,core},etc,lib,tmp} \
+		/var/log/pakfire /var/cache/pakfire
+	cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
+	mv -vf $(DIR_APP)/pakfire.conf $(DIR_APP)/etc/
+	chown root.root $(DIR_APP) -R
+	chmod 755 $(DIR_APP)/pakfire
+	
 	-cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
-	-cd $(DIR_APP) && find /opt/confire -name .svn -exec rm -rf {} \;
+	ln -sf ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update
+	
+	touch /var/log/pakfire.log
+	ln -sf ../../var/log/pakfire /opt/pakfire/logs
+	ln -sf ../../var/cache/pakfire /opt/pakfire/cache
 	@$(POSTBUILD)
-