diff options
| author | Brian Behlendorf <[email protected]> | 2013-02-08 10:01:41 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-03-06 15:46:40 -0800 |
| commit | 48c028f5a5558894f8d94652050bc8e644760b9a (patch) | |
| tree | 395c876cfa8d8e564ecbb7ef8110a96cb341c2aa /scripts/common.sh.in | |
| parent | 0b4d1b5853791e1e447d74f0b229800d65b53071 (diff) | |
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 <[email protected]>
Diffstat (limited to 'scripts/common.sh.in')
| -rw-r--r-- | scripts/common.sh.in | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scripts/common.sh.in b/scripts/common.sh.in index c99894cbf..29b85d3e1 100644 --- 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} |