diff options
| author | Brian Behlendorf <[email protected]> | 2010-09-02 13:18:17 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-09-02 13:18:17 -0700 |
| commit | 8160dd9a74b5b5eb3439d4aa0f0bc50e3400c123 (patch) | |
| tree | 5b6a56894c0385f8ddf3afc027931aec3fb82384 | |
| parent | 7d06aee0965d66e6e5eb413c2b3ddfc049398ee0 (diff) | |
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.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 5a0791b44..f573e1d17 100644 --- 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 87ed50c78..b9ac6fde9 100644 --- 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 |