pakfire: use correct tree on x86_64.

[ipfire-2.x.git] / lfs / pakfire

diff --git a/lfs/pakfire b/lfs/pakfire
index 01eed9f42c00c349d59421dde3ed4c2bbdd19216..00d1bb1c0d5b2bedba2a08aaaa5488258409e978 100644 (file)
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -30,6 +30,12 @@ THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "i586"
+       PAKFIRE_VERSION = $(VERSION)
+else
+       PAKFIRE_VERSION = $(VERSION)-$(MACHINE)
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,18 +54,17 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @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/
+       sed -e "s/@VERSION@/$(PAKFIRE_VERSION)/g" \
+               < $(DIR_APP)/pakfire.conf \
+               > $(DIR_APP)/etc/pakfire.conf
        chown root.root $(DIR_APP) -R
        chmod 755 $(DIR_APP)/pakfire
-       
-       -cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
-       ln -sf ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update
-       
        touch /var/log/pakfire.log
+       chown root.nobody /var/log/pakfire.log
+       chmod 664 /var/log/pakfire.log
        ln -sf ../../var/log/pakfire /opt/pakfire/logs
        ln -sf ../../var/cache/pakfire /opt/pakfire/cache
        @$(POSTBUILD)