Add -p switch to "zpool get"

[zfs.git] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a1dfc38..08a32b4 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,16 +1,27 @@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-nobase_pkglibexec_SCRIPTS  = common.sh
-nobase_pkglibexec_SCRIPTS += zconfig.sh
-nobase_pkglibexec_SCRIPTS += zfs.sh
-nobase_pkglibexec_SCRIPTS += zpool-create.sh
-nobase_pkglibexec_SCRIPTS += zpool-config/*
-EXTRA_DIST = zfs-update.sh $(nobase_pkglibexec_SCRIPTS)
+SUBDIRS = zpool-config zpios-test zpios-profile
 
-ZFS=${top_srcdir}/scripts/zfs.sh
-ZCONFIG=${top_srcdir}/scripts/zconfig.sh
-ZTEST=${top_builddir}/cmd/ztest/ztest
+EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool
+
+pkgdatadir = $(datadir)/@PACKAGE@
+dist_pkgdata_SCRIPTS = \
+       $(top_builddir)/scripts/common.sh \
+       $(top_srcdir)/scripts/zconfig.sh \
+       $(top_srcdir)/scripts/zfault.sh \
+       $(top_srcdir)/scripts/zfs.sh \
+       $(top_srcdir)/scripts/zpool-create.sh \
+       $(top_srcdir)/scripts/zpios.sh \
+       $(top_srcdir)/scripts/zpios-sanity.sh \
+       $(top_srcdir)/scripts/zpios-survey.sh \
+       $(top_srcdir)/scripts/smb.sh
+
+ZFS=$(top_builddir)/scripts/zfs.sh
+ZCONFIG=$(top_builddir)/scripts/zconfig.sh
+ZFAULT=$(top_builddir)/scripts/zfault.sh
+ZTEST=$(top_builddir)/cmd/ztest/ztest
+ZPIOS_SANITY=$(top_builddir)/scripts/zpios-sanity.sh
 
 check:
+       @$(ZFS) -u
        @echo
        @echo -n "===================================="
        @echo -n " ZTEST "
@@ -25,5 +36,19 @@ check:
        @echo -n " ZCONFIG "
        @echo    "==================================="
        @echo
-       @$(ZCONFIG)
+       @$(ZCONFIG) -c
+       @echo
+       @echo -n "==================================="
+       @echo -n " ZFAULT "
+       @echo    "==================================="
+       @echo
+       @$(ZFAULT) -c
+       @echo
+       @echo -n "===================================="
+       @echo -n " ZPIOS "
+       @echo    "===================================="
+       @echo
+       @$(ZFS)
+       @$(ZPIOS_SANITY)
+       @$(ZFS) -u
        @echo