Merge commit 'refs/top-bases/top' into top

2009-01-05 11:23:18 -08:00 · 2009-01-05 11:23:18 -08:00 · c30f28a100
parent 9d78cc537e cb95f47aaf
commit c30f28a100
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 zpios
+SUBDIRS = zfs zpool zdb zinject ztest zpios
--- a/configure.ac
+++ b/configure.ac
@ -70,7 +70,6 @@ AC_CONFIG_FILES([
 	lib/libzfs/Makefile
 	cmd/Makefile
 	cmd/zdb/Makefile
-	cmd/zdump/Makefile
 	cmd/zfs/Makefile
 	cmd/zinject/Makefile
 	cmd/zpool/Makefile