From 50df29f275d5359f4252f700f0df7072a3e11d1a Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 27 Apr 2020 10:38:26 +0300
Subject: [PATCH] bzip2: Revert to prior build method

---
 core/bzip2/build | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/bzip2/build b/core/bzip2/build
index ec3b9a3c..ac1055b2 100755
--- a/core/bzip2/build
+++ b/core/bzip2/build
@@ -2,15 +2,19 @@
 
 make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so
 make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" bzip2recover libbz2.a
-make PREFIX="$1/usr" install
 
-# Fix nonsensical man page handling.
-mkdir -p "$1/usr/share"
-mv    -f "$1/usr/man" "$1/usr/share/man"
+for bin in bzip2-shared bzdiff bzgrep bzip2recover bzmore; do
+    install -Dm755 "$bin" "$1/usr/bin/${bin%%-shared}"
+done
 
-# Install the shared library.
 install -Dm755 libbz2.so.1.0.8 "$1/usr/lib/libbz2.so.1.0.8"
+install -Dm644 libbz2.a        "$1/usr/lib/libbz2.a"
+install -Dm644 bzip2.1         "$1/usr/share/man/man1/bzip2.1"
+install -Dm644 bzlib.h         "$1/usr/include/bzlib.h"
 
 for lib in libbz2.so libbz2.so.1 libbz2.so.1.0; do
     ln -sf libbz2.so.1.0.8 "$1/usr/lib/$lib"
 done
+
+ln -sf bzip2 "$1/usr/bin/bunzip2"
+ln -sf bzip2 "$1/usr/bin/bzcat"