diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2011-07-16 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (AUTOMAKE_OPTIONS): Removed. + * configure.ac (AM_INIT_AUTOMAKE): Removed dist-bzip2 option, on + advice from Karl Berry. + 2011-07-15 John Haque <j.eh@mchsi.com> * awk.h (Op_sub_builtin): New opcode. diff --git a/Makefile.am b/Makefile.am index 855a5e7b..9f4993f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,9 +23,6 @@ ## process this file with automake to produce Makefile.in -# Make .bz2 files also. -AUTOMAKE_OPTIONS = dist-bzip2 - # This variable insures that aclocal runs # correctly after changing configure.ac ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index 2801c612..7310a6fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -170,7 +170,7 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -299,9 +299,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -# Make .bz2 files also. -AUTOMAKE_OPTIONS = dist-bzip2 - # This variable insures that aclocal runs # correctly after changing configure.ac ACLOCAL_AMFLAGS = -I m4 @@ -765,6 +762,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -791,7 +789,6 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) diff --git a/configure.ac b/configure.ac index ce824447..45ffe80a 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ then fi AC_PREREQ(2.68) -AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz]) +AM_INIT_AUTOMAKE([1.11 dist-xz]) AC_CONFIG_MACRO_DIR([m4]) |