Merge branch 'next' into initscripts-cleanup

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

diff --git a/lfs/unzip b/lfs/unzip
index 2013cc1327ab2c6c36c0aeedcdabd8f448581f09..f479d7e9f9fab3d42eebcf641e0080c075b1aa92 100644 (file)
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -70,11 +70,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(MACHINE_TYPE)" "arm"
-       # ARM cannot use the x86 assembly code.
-       cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
-else
+ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
+else
+       # ARM/x86_64 cannot use the x86 32 bit assembly code.
+       cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
 endif
        cd $(DIR_APP) && make prefix=/usr install
        @rm -rf $(DIR_APP)