]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
bzip2: Fix some errors in the makefile.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:32:33 +0000 (14:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:32:33 +0000 (14:32 +0100)
bzip2/bzip2.nm

index 44b0dd2892271f3985e730c4e08312e633dfcf8b..e1af92f1791213586d0659b63473699aa1eb265c 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = bzip2
 version    = 1.0.6
-release    = 4
+release    = 5
 
 groups     = Applications/Compression
 url        = http://www.bzip.org/
@@ -37,8 +37,8 @@ build
 
        install
                # Install binaries.
-               mkdir -pv %{BUILDROOT}/bin
-               cp -v bzip2-shared %{BUILDROOT}/bin/bzip2
+               mkdir -pv %{BUILDROOT}%{bindir}
+               cp -v bzip2-shared %{BUILDROOT}%{bindir}/bzip2
                ln -svf bzip2 %{BUILDROOT}%{bindir}/bunzip2
                ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcat
                ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcmp
@@ -47,21 +47,22 @@ build
                # 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
+               ln -svf libbz2.so.%{version} %{BUILDROOT}/%{lib}/libbz2.so.1
+               ln -svf ../../%{lib}/libbz2.so.1 %{BUILDROOT}%{libdir}/libbz2.so
 
                # Install headers.
                mkdir -pv %{BUILDROOT}%{includedir}
                install -m 644 bzlib.h %{BUILDROOT}%{includedir}
 
                # Install man pages.
-               mkdir -pv %{BUIDLROOT}%{mandir}/man1
+               mkdir -pv %{BUILDROOT}%{mandir}/man1
                cp -vp bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 %{BUILDROOT}%{mandir}/man1
+               chown root.root -v %{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
+               ln -svf bzmore.1 %{BUILDROOT}%{mandir}/man1/bzless.1
        end
 end