]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
unzip: Fix build to honour LDFLAGS
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 15 Oct 2016 13:05:47 +0000 (09:05 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 15 Oct 2016 13:05:47 +0000 (09:05 -0400)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
unzip/unzip.nm

index 2520810003c6165305978f15c4641b2ea852a165..ea4581544779d4344fb9b42c1cfdef98196990b6 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = unzip
 version    = 6.0
-release    = 4
+release    = 5
 
 groups     = Applications/Archiving
 url        = ftp://ftp.info-zip.org/pub/infozip/src/
@@ -31,22 +31,14 @@ CFLAGS    += -D_LARGEFILE64_SOURCE
 build
        DIR_APP = %{DIR_SRC}/%{thisapp}
 
-       prepare_cmds
-               ln -svf unix/Makefile Makefile
+       build
+               make -f unix/Makefile prefix=%{prefix} \
+                       CF="%{CFLAGS} -I." LF2="%{LDFLAGS}" unzips %{PARALLELISMFLAGS}
        end
 
-       make_build_targets += \
-               generic \
-               CC="gcc %{CFLAGS}" \
-               LD=gcc
-
-       make_install_targets += \
-               prefix=%{BUILDROOT}/usr \
-               MANDIR=/usr/share/man/man1 \
-               INSTALL="cp -p"
-
-       install_cmds
-               chown -v root.root %{BUILDROOT}/usr/bin/zipgrep
+       install
+               make -f unix/Makefile prefix=%{BUILDROOT}%{prefix} \
+                       MANDIR=%{BUILDROOT}%{mandir}/man1 INSTALL="cp -p" install
        end
 end