From 554eda040bfad5b43833adaa4975bca1eef74092 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 8 Oct 2019 10:19:58 +0300
Subject: [PATCH] zip: clean up build

---
 extra/zip/build   | 12 +++++++++---
 extra/zip/depends |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 extra/zip/depends

diff --git a/extra/zip/build b/extra/zip/build
index 6fe4f003..bb3316b4 100755
--- a/extra/zip/build
+++ b/extra/zip/build
@@ -1,6 +1,12 @@
 #!/bin/sh -e
 
-sed -e "s|generic CC=gcc CPP=\"gcc -E\"|zips CC=${CC:-gcc} CPP=\"$CPP -E\" CFLAGS=\"-DLARGE_FILE_SUPPORT $CFLAGS \${CFLAGS_NOOPT}\" LFLAGS2=\"$LDFLAGS\"|g" -i unix/Makefile
+make \
+    prefix=/usr \
+    CC="${CC:-gcc} $CFLAGS $CXXFLAGS" \
+    -f unix/Makefile generic
+
+make \
+    prefix="$1/usr" \
+    MANDIR="$1/usr/share/man/man1" \
+    -f unix/Makefile install
 
-make -f unix/Makefile prefix=/usr generic_gcc
-make prefix="$1/usr" MANDIR="$1/usr/share/man/man1" -f unix/Makefile install
diff --git a/extra/zip/depends b/extra/zip/depends
new file mode 100644
index 00000000..7a457127
--- /dev/null
+++ b/extra/zip/depends
@@ -0,0 +1 @@
+bzip2