Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent

2009-01-05 11:21:45 -08:00 · 2009-01-05 11:21:45 -08:00 · 4fc91de1fe
parent f21eb66cdc f25972b809
commit 4fc91de1fe
2 changed files with 1 additions and 2 deletions
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@ -1 +1 @@
-SUBDIRS = zfs zpool zdb zdump zinject ztest
+SUBDIRS = zfs zpool zdb zinject ztest
--- a/configure.ac
+++ b/configure.ac
@ -69,7 +69,6 @@ AC_CONFIG_FILES([
 	lib/libzfs/Makefile
 	cmd/Makefile
 	cmd/zdb/Makefile
 	cmd/zdump/Makefile
 	cmd/zfs/Makefile
 	cmd/zinject/Makefile
 	cmd/zpool/Makefile
`@ -1 +1 @@`
	`SUBDIRS = zfs zpool zdb zdump zinject ztest`	`SUBDIRS = zfs zpool zdb zinject ztest`