From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 2 Sep 2010 20:15:20 +0000 (-0700)
Subject: Remove spl-x.y.z.zip creation in 'make dist'
X-Git-Tag: spl-0.7.12~545
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d8a1b739359b04f016e2b81844a29c4d0de60bd8;p=mirror_spl.git

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

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

diff --git a/Makefile.am b/Makefile.am
index 184c300..3fe1eac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ KERNEL_DIR = module include
 endif
 SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh spl.spec.in spl-modules.spec.in META DISCLAIMER
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 noinst_HEADERS = spl_config.h
diff --git a/Makefile.in b/Makefile.in
index 189b77a..4180b81 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,7 +122,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
@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
 @CONFIG_USER_TRUE@USER_DIR = lib cmd scripts
 @CONFIG_KERNEL_TRUE@KERNEL_DIR = module include
 SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = autogen.sh spl.spec.in spl-modules.spec.in META \
 	DISCLAIMER config/config.awk config/rpm.am config/deb.am \
 	config/tgz.am
@@ -583,6 +583,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)
@@ -590,8 +591,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