Replace libexecdir with datadir

According to the FHS.  Testing scripts and examples which are all
architecture independent should be installed in a subdirectory
under /usr/share.

  http://www.pathname.com/fhs/2.2/fhs-4.11.html

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/PKGBUILD-zfs.in b/PKGBUILD-zfs.in
index e37a251..989d879 100644 (file)
--- a/PKGBUILD-zfs.in
+++ b/PKGBUILD-zfs.in
@@ -14,7 +14,6 @@ build() {
        ./configure --with-config=user \
                    --prefix=/ \
                    --sysconfdir=/etc \
-                   --libexecdir=/usr/libexec \
                    --datadir=/usr/share \
                    --includedir=/usr/include \
                    --with-udevdir=/lib/udev

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a969159..80e9cd1 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = zpool-config zpios-test zpios-profile
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-dist_pkglibexec_SCRIPTS = \
+dist_pkgdata_SCRIPTS = \
        $(top_builddir)/scripts/common.sh \
        $(top_srcdir)/scripts/zconfig.sh \
        $(top_srcdir)/scripts/zfault.sh \
@@ -18,24 +17,6 @@ ZFAULT=$(top_builddir)/scripts/zfault.sh
 ZTEST=$(top_builddir)/cmd/ztest/ztest
 ZPIOS_SANITY=$(top_builddir)/scripts/zpios-sanity.sh
 
-all:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ ! -e $$link ]; then \
-                       $(LN_S) $$file $$link; \
-               fi \
-       done
-
-clean:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ -L $$link ]; then \
-                       $(RM) $$link; \
-               fi \
-       done
-
 check:
        @$(ZFS) -u
        @echo

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index c99894c..29b85d3 100644 (file)
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -32,8 +32,7 @@ TESTS_SKIP=${TESTS_SKIP:-}
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libexecdir=@libexecdir@
-pkglibexecdir=${libexecdir}/@PACKAGE@
+pkgdatadir=@datarootdir@/@PACKAGE@
 bindir=@bindir@
 sbindir=@sbindir@
 udevdir=@udevdir@
@@ -42,9 +41,9 @@ sysconfdir=@sysconfdir@
 
 ETCDIR=${ETCDIR:-/etc}
 DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
-ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
-ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test}
-ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile}
+ZPOOLDIR=${ZPOOLDIR:-${pkgdatadir}/zpool-config}
+ZPIOSDIR=${ZPIOSDIR:-${pkgdatadir}/zpios-test}
+ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkgdatadir}/zpios-profile}
 
 ZDB=${ZDB:-${sbindir}/zdb}
 ZFS=${ZFS:-${sbindir}/zfs}
@@ -53,11 +52,11 @@ ZPOOL=${ZPOOL:-${sbindir}/zpool}
 ZTEST=${ZTEST:-${sbindir}/ztest}
 ZPIOS=${ZPIOS:-${sbindir}/zpios}
 
-COMMON_SH=${COMMON_SH:-${pkglibexecdir}/common.sh}
-ZFS_SH=${ZFS_SH:-${pkglibexecdir}/zfs.sh}
-ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkglibexecdir}/zpool-create.sh}
-ZPIOS_SH=${ZPIOS_SH:-${pkglibexecdir}/zpios.sh}
-ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkglibexecdir}/zpios-survey.sh}
+COMMON_SH=${COMMON_SH:-${pkgdatadir}/common.sh}
+ZFS_SH=${ZFS_SH:-${pkgdatadir}/zfs.sh}
+ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkgdatadir}/zpool-create.sh}
+ZPIOS_SH=${ZPIOS_SH:-${pkgdatadir}/zpios.sh}
+ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkgdatadir}/zpios-survey.sh}
 
 LDMOD=${LDMOD:-/sbin/modprobe}
 LSMOD=${LSMOD:-/sbin/lsmod}

diff --git a/scripts/zpios-profile/Makefile.am b/scripts/zpios-profile/Makefile.am
index 403c020..c87f169 100644 (file)
--- a/scripts/zpios-profile/Makefile.am
+++ b/scripts/zpios-profile/Makefile.am
@@ -1,25 +1,7 @@
-pkglibexecdir = $(libexecdir)/@PACKAGE@/zpios-profile
-dist_pkglibexec_SCRIPTS = \
+pkgdataprofiledir = $(pkgdatadir)/zpios-profile
+dist_pkgdataprofile_SCRIPTS = \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile-disk.sh \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile-pids.sh \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile-post.sh \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile-pre.sh \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile.sh
-
-all:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ ! -e $$link ]; then \
-                       $(LN_S) $$file $$link; \
-               fi \
-       done
-
-clean:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ -L $$link ]; then \
-                       $(RM) $$link; \
-               fi \
-       done

diff --git a/scripts/zpios-test/Makefile.am b/scripts/zpios-test/Makefile.am
index 54935b4..c74e24f 100644 (file)
--- a/scripts/zpios-test/Makefile.am
+++ b/scripts/zpios-test/Makefile.am
@@ -1,5 +1,5 @@
-pkglibexecdir = $(libexecdir)/@PACKAGE@/zpios-test
-dist_pkglibexec_SCRIPTS = \
+pkgdatatestdir = $(pkgdatadir)/zpios-test
+dist_pkgdatatest_SCRIPTS = \
        $(top_srcdir)/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \
        $(top_srcdir)/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \
        $(top_srcdir)/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh \
@@ -11,21 +11,3 @@ dist_pkglibexec_SCRIPTS = \
        $(top_srcdir)/scripts/zpios-test/small.sh \
        $(top_srcdir)/scripts/zpios-test/tiny.sh \
        $(top_srcdir)/scripts/zpios-test/lustre.sh
-
-all:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ ! -e $$link ]; then \
-                       $(LN_S) $$file $$link; \
-               fi \
-       done
-
-clean:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ -L $$link ]; then \
-                       $(RM) $$link; \
-               fi \
-       done

diff --git a/scripts/zpool-config/Makefile.am b/scripts/zpool-config/Makefile.am
index 87f58bb..2d77994 100644 (file)
--- a/scripts/zpool-config/Makefile.am
+++ b/scripts/zpool-config/Makefile.am
@@ -1,5 +1,5 @@
-pkglibexecdir = $(libexecdir)/@PACKAGE@/zpool-config
-dist_pkglibexec_SCRIPTS = \
+pkgdataconfigdir = $(pkgdatadir)/zpool-config
+dist_pkgdataconfig_SCRIPTS = \
        $(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid10.sh \
@@ -28,21 +28,3 @@ dist_pkglibexec_SCRIPTS = \
        $(top_srcdir)/scripts/zpool-config/zpool-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/zpool-raid10.sh \
        $(top_srcdir)/scripts/zpool-config/zpool-raidz.sh
-
-all:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ ! -e $$link ]; then \
-                       $(LN_S) $$file $$link; \
-               fi \
-       done
-
-clean:
-       @list='$(dist_pkglibexec_SCRIPTS)'; \
-       for file in $$list; do \
-               link=$$(basename $$file); \
-               if [ -L $$link ]; then \
-                       $(RM) $$link; \
-               fi \
-       done

diff --git a/zfs.spec.in b/zfs.spec.in
index 78a2bd8..179ef7c 100644 (file)
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files test
 %defattr(-,root,root)
-%{_libexecdir}/@PACKAGE@/*
+%{_datadir}/@PACKAGE@/*
 
 %files dracut
 %defattr(-,root,root)