move files from /lib

PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=bzip2
 pkgver=1.0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-quality data compression program"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -39,26 +39,22 @@ check() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -dm755 $pkgdir/bin
-  install -m755 bzip2-shared $pkgdir/bin/bzip2
-  install -m755 bzip2recover $pkgdir/bin
-  ln -sf bzip2 $pkgdir/bin/bunzip2
-  ln -sf bzip2 $pkgdir/bin/bzcat
+  install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1}
 
-  install -dm755 $pkgdir/usr/bin
-  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
+  install -m755 bzip2-shared $pkgdir/usr/bin/bzip2
+  install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin
+  ln -sf bzip2 $pkgdir/usr/bin/bunzip2
+  ln -sf bzip2 $pkgdir/usr/bin/bzcat
 
-  install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
+  install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib
+  ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so
+  ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1
+  ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0
+  install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
 
-  install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
-  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
+  install -m644 bzlib.h $pkgdir/usr/include/
 
-  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
-
-  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
+  install -m644 bzip2.1 $pkgdir/usr/share/man/man1/
   ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
   ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
   ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1