X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2FMakefile.am;h=3dc1e67fbefd075836fcbe8a19c8e360b2b95913;hb=6a0936babc14a44986265a12f206c41999bd48c3;hp=ed6e5028f39b40ed0ba97f832f93927da4148403;hpb=302ef1517e5769cbe6a12d94c89f44a90721bfd4;p=zfs.git

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ed6e502..3dc1e67 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,22 +1,42 @@
+SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
+
 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/*
-nobase_pkglibexec_SCRIPTS += zpios.sh
-nobase_pkglibexec_SCRIPTS += zpios-sanity.sh
-nobase_pkglibexec_SCRIPTS += zpios-survey.sh
-nobase_pkglibexec_SCRIPTS += zpios-test/*
-nobase_pkglibexec_SCRIPTS += zpios-profile/*
-EXTRA_DIST = zfs-update.sh $(nobase_pkglibexec_SCRIPTS)
+dist_pkglibexec_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
+
+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
 
-ZFS=${top_srcdir}/scripts/zfs.sh
-ZCONFIG=${top_srcdir}/scripts/zconfig.sh
-ZTEST=${top_builddir}/cmd/ztest/ztest
-ZPIOS_SANITY=${top_srcdir}/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
 	@echo -n "===================================="
 	@echo -n " ZTEST "
@@ -31,7 +51,13 @@ 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 "