X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpakfire;h=00d1bb1c0d5b2bedba2a08aaaa5488258409e978;hp=11608b36d13cb2186d82e4da6b75cf2e8c6b36ea;hb=d9c6f56c2ea171cbc1fa396feb30d2814b9a818d;hpb=e137ec4ecf166320ce92d5068e864034e19b8f48 diff --git a/lfs/pakfire b/lfs/pakfire index 11608b36d1..00d1bb1c0d 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 "$(MACHINE)" "i586" PAKFIRE_VERSION = $(VERSION) +else + PAKFIRE_VERSION = $(VERSION)-$(MACHINE) 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)