X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpakfire;h=48e84145cdc0d9111482514c63b74984f5b84c9a;hp=cc9eac82937cb69453240017293b9d7cc235a8d2;hb=82b405615f47bb1dc34f4a3b488cb282058e9be3;hpb=91a08eac19c14ef63388d3bd37989b63a3281e84

diff --git a/lfs/pakfire b/lfs/pakfire
index cc9eac8293..48e84145cd 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,6 +30,12 @@ THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(BUILD_ARCH)" "i586"
+	PAKFIRE_VERSION = $(VERSION)
+else
+	PAKFIRE_VERSION = $(VERSION)-$(BUILD_ARCH)
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,17 +54,14 @@ 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