X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpakfire;h=48e84145cdc0d9111482514c63b74984f5b84c9a;hb=d38f3eed08d71343cc16de61373860e5aa7efcfd;hp=8038753b12be6bb4b1b1f2cf6296ad6f2400b2f8;hpb=e959976b45238278c16e3b8d06a51976fc814cac;p=ipfire-2.x.git

diff --git a/lfs/pakfire b/lfs/pakfire
index 8038753b12..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,11 +54,12 @@ 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
 	touch /var/log/pakfire.log