Distribute .tar.gz and .tar.bz2 but not .shar.gz

This commit is contained in:
Adam Spiers 2011-11-24 16:22:11 +00:00
parent 10ea9c6f4b
commit c019af00a0
2 changed files with 8 additions and 4 deletions

View file

@ -4,6 +4,12 @@ dist_bin_SCRIPTS = bin/stow bin/chkstow
info_TEXINFOS = doc/stow.texi info_TEXINFOS = doc/stow.texi
dist_man_MANS = doc/stow.8 dist_man_MANS = doc/stow.8
dist_doc_DATA = README doc/manual.html doc/manual.pdf dist_doc_DATA = README doc/manual.html doc/manual.pdf
# Would be nice to include the split page HTML version of the manual
# in the distribution, but automake doesn't support wildcards and I'm
# loathe to explicitly list every single page here :-(
#nobase_dist_doc_DATA = doc/stow.html/*.html
pmdir = $(libdir)/perl5 pmdir = $(libdir)/perl5
dist_pm_DATA = lib/Stow.pm dist_pm_DATA = lib/Stow.pm
pmstowdir = $(pmdir)/Stow pmstowdir = $(pmdir)/Stow
@ -35,8 +41,6 @@ TESTS_ENVIRONMENT = $(PERL) -I$(srcdir)/bin -I$(srcdir)/lib -I$(TESTS_DIR)
# exists (otherwise automake will try to build it). # exists (otherwise automake will try to build it).
TESTS = t TESTS = t
AUTOMAKE_OPTIONS = dist-shar
# GNU autotools standardised on the 'check' target, but CPAN (and the # GNU autotools standardised on the 'check' target, but CPAN (and the
# rest of the world) standardised on the 'test' target. # rest of the world) standardised on the 'test' target.
test: check test: check
@ -76,7 +80,7 @@ EXTRA_DIST = \
$(CPAN_FILES) $(CPAN_FILES)
CLEANFILES = $(bin_SCRIPTS) $(dist_pm_DATA) CLEANFILES = $(bin_SCRIPTS) $(dist_pm_DATA)
# clean up files left behind by test suite # clean up auto-generated files
clean-local: clean-local:
-rm -rf $(TESTS_OUT) \ -rm -rf $(TESTS_OUT) \
bin/stow bin/chkstow doc/stow.8 ChangeLog \ bin/stow bin/chkstow doc/stow.8 ChangeLog \

View file

@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR([automake])
# Unfortunately we have to disable warnings for overrides, because we # Unfortunately we have to disable warnings for overrides, because we
# need to override the built-in `check' rule and also the TEXI2DVI # need to override the built-in `check' rule and also the TEXI2DVI
# variable. # variable.
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-override]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-override dist-bzip2])
AC_PROG_INSTALL AC_PROG_INSTALL
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])