X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpakfire;h=b584cc5611ee950bc5538773c038cc674a528726;hb=1b0ff72dad0225f1b636605e17a42c465f96d884;hp=11608b36d13cb2186d82e4da6b75cf2e8c6b36ea;hpb=84aed1ea54ea5e482d3e7dcd7075188062ae85b1;p=ipfire-2.x.git diff --git a/lfs/pakfire b/lfs/pakfire index 11608b36d1..b584cc5611 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -30,10 +30,10 @@ THISAPP = pakfire DIR_APP = /opt/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -ifeq "$(MACHINE_TYPE)" "arm" - PAKFIRE_VERSION = $(VERSION)-$(MACHINE) -else +ifeq "$(BUILD_ARCH)" "i586" PAKFIRE_VERSION = $(VERSION) +else + PAKFIRE_VERSION = $(VERSION)-$(BUILD_ARCH) endif ############################################################################### @@ -54,7 +54,6 @@ 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)