[gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-devel/spl/, sys-fs/zfs/files/

[gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-devel/spl/, sys-fs/zfs/files/

[Alexey Shvetsov]

commit:     ec2a75d178451518dbc07a134e7e1ca1513f5fd9
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 23:02:43 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 23:02:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec2a75d1

More zfs updates

---
 sys-devel/spl/spl-0.6.0_rc3.ebuild |    2 --
 sys-devel/spl/spl-9999.ebuild      |    2 --
 sys-fs/zfs/files/zfs.initd         |    4 ++--
 sys-fs/zfs/zfs-0.6.0_rc3.ebuild    |    2 --
 sys-fs/zfs/zfs-9999.ebuild         |    2 --
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sys-devel/spl/spl-0.6.0_rc3.ebuild b/sys-devel/spl/spl-0.6.0_rc3.ebuild
index e680822..4970482 100644
--- a/sys-devel/spl/spl-0.6.0_rc3.ebuild
+++ b/sys-devel/spl/spl-0.6.0_rc3.ebuild
@@ -32,8 +32,6 @@ src_prepare() {
 src_configure() {
 	set_arch_to_kernel
 	econf \
-		--prefix="${EPREFIX}" \
-		--includedir="${EPREFIX}"/usr/include \
 		--with-config=all \
 		--with-linux="${KERNEL_DIR}" \
 		--with-linux-obj="${KERNEL_DIR}"

diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuild
index c687962..2bf68c0 100644
--- a/sys-devel/spl/spl-9999.ebuild
+++ b/sys-devel/spl/spl-9999.ebuild
@@ -31,8 +31,6 @@ src_prepare() {
 src_configure() {
 	set_arch_to_kernel
 	econf \
-		--prefix="${EPREFIX}" \
-		--includedir="${EPREFIX}"/usr/include \
 		--with-config=all \
 		--with-linux="${KERNEL_DIR}" \
 		--with-linux-obj="${KERNEL_DIR}"

diff --git a/sys-fs/zfs/files/zfs.initd b/sys-fs/zfs/files/zfs.initd
index d8ec4ea..878c054 100644
--- a/sys-fs/zfs/files/zfs.initd
+++ b/sys-fs/zfs/files/zfs.initd
@@ -9,8 +9,8 @@ depend() {
 }
 
 CACHEFILE=/etc/zfs/zpool.cache
-ZPOOL=/sbin/zpool
-ZFS=/sbin/zfs
+ZPOOL=/usr/sbin/zpool
+ZFS=/usr/sbin/zfs
 ZFS_MODULE=zfs
 LOCKFILE=/var/lock/zfs/zfs_lockfile
 

diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
index 1f1078d..ffbd90a 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
@@ -35,8 +35,6 @@ src_prepare() {
 src_configure() {
 	set_arch_to_kernel
 	econf \
-		--prefix="${EPREFIX}" \
-		--includedir="${EPREFIX}"/usr/include \
 		--with-config=all \
 		--with-linux="${KERNEL_DIR}" \
 		--with-linux-obj="${KERNEL_DIR}" \

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index d7ee31a..bb45a87 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -36,8 +36,6 @@ src_prepare() {
 src_configure() {
 	set_arch_to_kernel
 	econf \
-		--prefix="${EPREFIX}" \
-		--includedir="${EPREFIX}"/usr/include \
 		--with-config=all \
 		--with-linux="${KERNEL_DIR}" \
 		--with-linux-obj="${KERNEL_DIR}" \