From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Dec 2011 19:13:54 +0000 (+0100)
Subject: bzip2: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32f7e83bdefac3dae867cc8652a1ee44b797afc;p=ipfire-3.x.git

bzip2: Make package work on x86_64.
---

diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm
index 39dcf1896..44b0dd289 100644
--- a/bzip2/bzip2.nm
+++ b/bzip2/bzip2.nm
@@ -5,7 +5,7 @@
 
 name       = bzip2
 version    = 1.0.6
-release    = 3
+release    = 4
 
 groups     = Applications/Compression
 url        = http://www.bzip.org/
@@ -29,28 +29,39 @@ build
 
 	build
 		%{DO_FIX_LIBTOOL}
-		make -f Makefile-libbz2_so %{PARALLELISMFLAGS} \
-			CFLAGS="%{CFLAGS}"
+		make -f Makefile-libbz2_so %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}"
 
 		make clean
-		make %{PARALLELISMFLAGS} \
-			CFLAGS="%{CFLAGS}"
+		make %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}"
 	end
 
 	install
-		make PREFIX=%{BUILDROOT}/usr install
-
-		mkdir -pv %{BUILDROOT}/{bin,lib}
+		# Install binaries.
+		mkdir -pv %{BUILDROOT}/bin
 		cp -v bzip2-shared %{BUILDROOT}/bin/bzip2
-		cp -av libbz2.so* %{BUILDROOT}/lib
-		ln -sfv ../../lib/libbz2.so.1.0 %{BUILDROOT}/usr/lib/libbz2.so
-		rm -fv %{BUILDROOT}/usr/bin/{bunzip2,bzcat,bzip2}
-		ln -sfv bzip2 %{BUILDROOT}/bin/bunzip2
-		ln -sfv bzip2 %{BUILDROOT}/bin/bzcat
-		rm -vf %{BUILDROOT}/usr/lib/libbz2.a
+		ln -svf bzip2 %{BUILDROOT}%{bindir}/bunzip2
+		ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcat
+		ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcmp
+		ln -svf bzip2 %{BUILDROOT}%{bindir}/bless
+
+		# Install libs.
+		mkdir -pv %{BUILDROOT}%{libdir} %{BUILDROOT}/%{lib}
+		install -m 755 libbz2.so.%{version} %{BUILDROOT}/%{lib}
+		ln -svf libbz2.so.%{version} %{BUILDROOT}/lib/libbz2.so.1
+		ln -svf ../../lib/libbz2.so.1.0 %{BUILDROOT}%{libdir}/libbz2.so
+
+		# Install headers.
+		mkdir -pv %{BUILDROOT}%{includedir}
+		install -m 644 bzlib.h %{BUILDROOT}%{includedir}
 
-		mkdir -pv %{BUIDLROOT}/usr/share
-		mv -vf %{BUILDROOT}/usr/man %{BUILDROOT}/usr/share/
+		# Install man pages.
+		mkdir -pv %{BUIDLROOT}%{mandir}/man1
+		cp -vp bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 %{BUILDROOT}%{mandir}/man1
+		ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bzip2recover.1
+		ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bunzip2.1
+		ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bzcat.1
+		ln -svf bzdiff.1 %{BUILDROOT}%{mandir}/man1/bzcmp.1
+		ln -svf bzmore2.1 %{BUILDROOT}%{mandir}/man1/bzless.1
 	end
 end