Remove zfs-x.y.z.zip creation in 'make dist'

Do no create a zfs-x.y.z.zip file as part of 'make dist'.  Simply
create the standard zfs-x.y.z.tar.gz file.

diff --git a/Makefile.am b/Makefile.am
index 5a0791b44d6d471688d893ed5140690d529bfb0b..f573e1d17d897cf436abce6d6e719036815ba7f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ KERNEL_DIR = module
 endif
 SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown

diff --git a/Makefile.in b/Makefile.in
index 87ed50c782b39b537b920b574935b8be2da041f8..b9ac6fde901ef68f57e3c34eb7aabec075bc8865 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,7 +146,7 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
+DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
@@ -323,7 +323,7 @@ top_srcdir = @top_srcdir@
 @CONFIG_USER_TRUE@USER_DIR = config etc man scripts lib cmd
 @CONFIG_KERNEL_TRUE@KERNEL_DIR = module
 SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in \
        config/config.awk config/rpm.am config/deb.am config/tgz.am \
        META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE \
@@ -635,6 +635,7 @@ dist-tarZ: distdir
 dist-shar: distdir
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
        $(am__remove_distdir)
+
 dist-zip: distdir
        -rm -f $(distdir).zip
        zip -rq $(distdir).zip $(distdir)
@@ -642,8 +643,6 @@ dist-zip: distdir
 
 dist dist-all: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       -rm -f $(distdir).zip
-       zip -rq $(distdir).zip $(distdir)
        $(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then