Move "/usr/lib/zfs-0.8.3/zfs" to "/usr/lib/zfs", remove "/lib"

src/kernels/_utils.sh

@@ -3,7 +3,7 @@ mode_name="utils"
 mode_desc="Select and use the utils packages"
 
 # version
-pkgrel="1"
+pkgrel="2"
 
 # Version for GIT packages
 pkgrel_git="1"

src/kernels/dkms.sh

@@ -3,7 +3,7 @@ mode_name="dkms"
 mode_desc="Select and use the dkms packages"
 
 # version
-pkgrel="3"
+pkgrel="4"
 
 # Version for GIT packages
 pkgrel_git="1"

src/kernels/linux-hardened.sh

@@ -4,7 +4,7 @@ package_base="linux-hardened"
 mode_desc="Select and use the packages for the linux-hardened kernel"
 
 # pkgrel for hardened packages
-pkgrel="1"
+pkgrel="2"
 
 # pkgrel for GIT packages
 pkgrel_git="1"

src/kernels/linux-lts.sh

@@ -4,7 +4,7 @@ package_base="linux-lts"
 mode_desc="Select and use the packages for the linux-lts kernel"
 
 # pkgrel for LTS packages
-pkgrel="1"
+pkgrel="2"
 
 # pkgrel for GIT packages
 pkgrel_git="1"

src/kernels/linux-zen.sh

@@ -4,7 +4,7 @@ package_base="linux-zen"
 mode_desc="Select and use the packages for the linux-zen kernel"
 
 # pkgrel for ZEN packages
-pkgrel="1"
+pkgrel="2"
 
 # pkgrel for GIT packages
 pkgrel_git="1"

src/kernels/linux.sh

@@ -4,7 +4,7 @@ package_base="linux"
 mode_desc="Select and use the packages for the default linux kernel"
 
 # pkgrel for default ZFS packages
-pkgrel="1"
+pkgrel="2"
 
 # pkgrel for GIT packages
 pkgrel_git="1"

src/zfs-utils/PKGBUILD.sh

@@ -32,7 +32,7 @@ build() {
     ./autogen.sh
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \\
                 --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \\
-                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-\${pkgver} \\
+                --with-udevdir=/usr/lib/udev --libexecdir=/usr/lib \\
                 --with-config=user --enable-systemd --enable-pyzfs
     make
 }
@@ -46,10 +46,6 @@ package() {
     rm -r "\${pkgdir}"/usr/share/initramfs-tools
     rm -r "\${pkgdir}"/usr/lib/modules-load.d
 
-    # move module tree /lib -> /usr/lib
-    cp -r "\${pkgdir}"/{lib,usr}
-    rm -r "\${pkgdir}"/lib
-
     # Autoload the zfs module at boot
     mkdir -p "\${pkgdir}/etc/modules-load.d"
     printf "%s\n" "zfs" > "\${pkgdir}/etc/modules-load.d/zfs.conf"

src/zfs/PKGBUILD.sh

@@ -34,8 +34,8 @@ build() {
     cd "${zfs_workdir}"
     ./autogen.sh
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \\
-                --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \\
-                --libexecdir=/usr/lib/zfs-\${_zfsver} --with-config=kernel \\
+                --datadir=/usr/share --includedir=/usr/include --with-udevdir=/usr/lib/udev \\
+                --libexecdir=/usr/lib --with-config=kernel \\
                 --with-linux=/usr/lib/modules/\${_extramodules}/build \\
                 --with-linux-obj=/usr/lib/modules/\${_extramodules}/build
     make
@@ -50,9 +50,7 @@ package_${zfs_pkgname}() {
     ${zfs_replaces}
 
     cd "${zfs_workdir}"
-    make DESTDIR="\${pkgdir}" install
-    cp -r "\${pkgdir}"/{lib,usr}
-    rm -r "\${pkgdir}"/lib
+    make DESTDIR="\${pkgdir}" INSTALL_MOD_PATH=/usr install
 
     # Remove src dir
     rm -r "\${pkgdir}"/usr/src