From 7aa61353030203e50b26821f584a3b0971f30e4bc16644415aa144aa17ba9bba Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 25 Jan 2008 15:52:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=6 --- automake-1.10.1.tar.bz2 | 3 + automake-1.10.tar.bz2 | 3 - automake-SuSE.patch | 32 ++++-- automake.changes | 35 +++++++ automake.spec | 210 +++++++++++++++++++++++----------------- lzma.diff | 142 --------------------------- 6 files changed, 180 insertions(+), 245 deletions(-) create mode 100644 automake-1.10.1.tar.bz2 delete mode 100644 automake-1.10.tar.bz2 delete mode 100644 lzma.diff diff --git a/automake-1.10.1.tar.bz2 b/automake-1.10.1.tar.bz2 new file mode 100644 index 0000000..ca6691a --- /dev/null +++ b/automake-1.10.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b26a3499672b0eddcbd87c8e61dfb60ae74d9ee0cc181a5d924fb73db62a25ec +size 918341 diff --git a/automake-1.10.tar.bz2 b/automake-1.10.tar.bz2 deleted file mode 100644 index c63a547..0000000 --- a/automake-1.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697 -size 893866 diff --git a/automake-SuSE.patch b/automake-SuSE.patch index ab1c497..b5ec300 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -1,6 +1,6 @@ --- lib/config.guess +++ lib/config.guess -@@ -139,6 +139,16 @@ +@@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -17,16 +17,24 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -829,7 +839,7 @@ - echo ${UNAME_MACHINE}-pc-minix +@@ -840,13 +850,13 @@ EOF + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi + fi exit ;; - arm*:Linux:*:*) + avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu -@@ -838,16 +848,16 @@ +@@ -855,16 +865,16 @@ EOF echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) @@ -47,7 +55,7 @@ exit ;; mips:Linux:*:*) eval $set_cc_for_build -@@ -870,7 +880,7 @@ +@@ -887,7 +897,7 @@ EOF s: ::g p }'`" @@ -56,7 +64,7 @@ ;; mips64:Linux:*:*) eval $set_cc_for_build -@@ -893,16 +903,16 @@ +@@ -910,16 +920,16 @@ EOF s: ::g p }'`" @@ -77,7 +85,7 @@ exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -916,36 +926,36 @@ +@@ -933,39 +943,39 @@ EOF esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -121,9 +129,13 @@ - echo x86_64-unknown-linux-gnu + echo x86_64-${VENDOR}-linux-gnu exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so -@@ -960,18 +970,18 @@ +@@ -980,18 +990,18 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) @@ -146,7 +158,7 @@ exit ;; esac # Determine whether the default compiler is a.out or elf -@@ -1005,7 +1015,7 @@ +@@ -1025,7 +1035,7 @@ EOF p }'`" test x"${LIBC}" != x && { diff --git a/automake.changes b/automake.changes index dac7eb5..4427f12 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Jan 22 10:31:29 CET 2008 - schwab@suse.de + +- Update to automake 1.10.1. + * Automake development is done in a git repository on Savannah now, see + http://git.sv.gnu.org/gitweb/?p=automake.git + A read-only CVS mirror is provided at + cvs -d :pserver:anonymous@pserver.git.sv.gnu.org:/automake.git \ + checkout -d automake HEAD + * "make dist" can now create lzma-compressed tarballs. + * `automake --add-missing' will by default install the GPLv3 file as + COPYING if it is missing. Note that Automake will never overwrite + an existing COPYING file, even when the `--force-missing' option is + used. Further note that Automake 1.10.1 is still licensed under GPLv2+. + * Libtool generic flags are now passed to the install and uninstall + modes as well. + * Files with extension .sx are also treated as preprocessed assembler. + * install-sh now has an BSD-like option `-C' to preserve modification + times of unchanged files upon installation. + * Fix aix dependency tracking for libtool objects. + * The signal handling of aclocal has been improved. + * Targets beginning with a digit are now recognized correctly. + * All directories `.libs'/`_libs' used by libtool are cleaned now, + not only those in which libraries are built. + * Fix output of dummy dependency files in presence of post-processed + Makefile.in's again, but also cope with long lines. + * $(EXEEXT) is automatically appended to filenames of XFAIL_TESTS + that have been declared as programs in the same Makefile. + This is for consistency with the analogous change to TESTS in 1.10. + * The autoconf version check implemented by aclocal in aclocal.m4 + (and new in Automake 1.10) is degraded to a warning. This helps + in the common case where the Autoconf versions used are compatible. + * Fix order of standard includes to again be `-I. -I$(srcdir)', + followed by directories containing config headers. + ------------------------------------------------------------------- Fri Nov 23 10:21:05 CET 2007 - schwab@suse.de diff --git a/automake.spec b/automake.spec index 50bca5b..602ca17 100644 --- a/automake.spec +++ b/automake.spec @@ -1,7 +1,7 @@ # -# spec file for package automake (Version 1.10) +# spec file for package automake (Version 1.10.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -17,14 +17,13 @@ Group: Development/Tools/Building AutoReqProv: on PreReq: %{install_info_prereq} Requires: autoconf >= 2.60 -Version: 1.10 -Release: 54 +Version: 1.10.1 +Release: 1 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.bz2 Patch1: automake-SuSE.patch -Patch2: lzma.diff Patch3: require_file.patch %description @@ -45,7 +44,6 @@ Authors: %prep %setup -q -n automake-%{version} %patch1 -%patch2 -p1 %patch3 %build @@ -86,15 +84,47 @@ rm -rf $RPM_BUILD_ROOT %config /etc/aclocal_dirlist %changelog -* Fri Nov 23 2007 - schwab@suse.de +* Tue Jan 22 2008 schwab@suse.de +- Update to automake 1.10.1. + * Automake development is done in a git repository on Savannah now, see + http://git.sv.gnu.org/gitweb/?p=automake.git + A read-only CVS mirror is provided at + cvs -d :pserver:anonymous@pserver.git.sv.gnu.org:/automake.git \ + checkout -d automake HEAD + * "make dist" can now create lzma-compressed tarballs. + * `automake --add-missing' will by default install the GPLv3 file as + COPYING if it is missing. Note that Automake will never overwrite + an existing COPYING file, even when the `--force-missing' option is + used. Further note that Automake 1.10.1 is still licensed under GPLv2+. + * Libtool generic flags are now passed to the install and uninstall + modes as well. + * Files with extension .sx are also treated as preprocessed assembler. + * install-sh now has an BSD-like option `-C' to preserve modification + times of unchanged files upon installation. + * Fix aix dependency tracking for libtool objects. + * The signal handling of aclocal has been improved. + * Targets beginning with a digit are now recognized correctly. + * All directories `.libs'/`_libs' used by libtool are cleaned now, + not only those in which libraries are built. + * Fix output of dummy dependency files in presence of post-processed + Makefile.in's again, but also cope with long lines. + * $(EXEEXT) is automatically appended to filenames of XFAIL_TESTS + that have been declared as programs in the same Makefile. + This is for consistency with the analogous change to TESTS in 1.10. + * The autoconf version check implemented by aclocal in aclocal.m4 + (and new in Automake 1.10) is degraded to a warning. This helps + in the common case where the Autoconf versions used are compatible. + * Fix order of standard includes to again be `-I. -I$(srcdir)', + followed by directories containing config headers. +* Fri Nov 23 2007 schwab@suse.de - Fix last change. -* Tue Nov 13 2007 - dmueller@suse.de +* Tue Nov 13 2007 dmueller@suse.de - require the autoconf version it was build against -* Thu Oct 11 2007 - schwab@suse.de +* Thu Oct 11 2007 schwab@suse.de - Add lzma support. -* Mon Jan 29 2007 - sbrabec@suse.cz +* Mon Jan 29 2007 sbrabec@suse.cz - Removed references to /opt/gnome. -* Sun Oct 15 2006 - schwab@suse.de +* Sun Oct 15 2006 schwab@suse.de - Update to automake 1.10. * Version requirements: - Autoconf 2.60 or greater is required. @@ -217,172 +247,172 @@ rm -rf $RPM_BUILD_ROOT - Automake installs a "Hello World!" example package in $(docdir). This example is used throughout the new "Autotools Introduction" chapter of the manual. -* Mon Aug 21 2006 - sbrabec@suse.cz +* Mon Aug 21 2006 sbrabec@suse.cz - Removed dirlist.d support, use hardwired path instead. -* Mon Jul 31 2006 - schwab@suse.de +* Mon Jul 31 2006 schwab@suse.de - Remove obsolete patch. -* Mon May 15 2006 - schwab@suse.de +* Mon May 15 2006 schwab@suse.de - Import latest versions of config.{guess,sub}. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jul 11 2005 - schwab@suse.de +* Mon Jul 11 2005 schwab@suse.de - Update to automake 1.9.6. -* Sun May 08 2005 - schwab@suse.de +* Sun May 08 2005 schwab@suse.de - Some architectures can't keep up the pace. -* Sat May 07 2005 - matz@suse.de +* Sat May 07 2005 matz@suse.de - Split away an automake-check package, which does the make check. -* Sun Feb 13 2005 - schwab@suse.de +* Sun Feb 13 2005 schwab@suse.de - Update to automake 1.9.5. -* Fri Jan 14 2005 - schwab@suse.de +* Fri Jan 14 2005 schwab@suse.de - Fix require_file_internal to handle file names with directories [#49822]. -* Wed Jan 12 2005 - schwab@suse.de +* Wed Jan 12 2005 schwab@suse.de - Update to automake 1.9.4. -* Thu Nov 25 2004 - ro@suse.de +* Thu Nov 25 2004 ro@suse.de - incremental fix for py-compile -* Fri Nov 19 2004 - schwab@suse.de +* Fri Nov 19 2004 schwab@suse.de - Fix py-compile to avoid putting $(DESTDIR) in the output. -* Mon Nov 01 2004 - schwab@suse.de +* Mon Nov 01 2004 schwab@suse.de - Update to automake 1.9.3. -* Fri Oct 08 2004 - schwab@suse.de +* Fri Oct 08 2004 schwab@suse.de - Update to automake 1.9.2. -* Mon Aug 30 2004 - schwab@suse.de +* Mon Aug 30 2004 schwab@suse.de - Fix $PATH_PATTERN. -* Tue Aug 17 2004 - schwab@suse.de +* Tue Aug 17 2004 schwab@suse.de - Fix handling of subdir-objects. -* Thu Aug 12 2004 - schwab@suse.de +* Thu Aug 12 2004 schwab@suse.de - Update to automake 1.9.1. -* Thu Jul 29 2004 - schwab@suse.de +* Thu Jul 29 2004 schwab@suse.de - Update to automake 1.9. -* Mon Jul 19 2004 - schwab@suse.de +* Mon Jul 19 2004 schwab@suse.de - Fix quoting. -* Sat Jul 17 2004 - schwab@suse.de +* Sat Jul 17 2004 schwab@suse.de - Update to automake 1.8d (1.9 release candidate). -* Mon May 17 2004 - schwab@suse.de +* Mon May 17 2004 schwab@suse.de - Update to automake 1.8.5. -* Tue May 04 2004 - schwab@suse.de +* Tue May 04 2004 schwab@suse.de - Update to automake 1.8.4. -* Sun Mar 07 2004 - schwab@suse.de +* Sun Mar 07 2004 schwab@suse.de - Update to automake 1.8.3. -* Sat Jan 17 2004 - schwab@suse.de +* Sat Jan 17 2004 schwab@suse.de - Fix race condition in testsuite. -* Tue Jan 13 2004 - schwab@suse.de +* Tue Jan 13 2004 schwab@suse.de - Update to automake 1.8.2. -* Mon Jan 12 2004 - schwab@suse.de +* Mon Jan 12 2004 schwab@suse.de - Update to automake 1.8.1. -* Thu Jan 08 2004 - schwab@suse.de +* Thu Jan 08 2004 schwab@suse.de - Fix use of undefined value. -* Thu Dec 11 2003 - schwab@suse.de +* Thu Dec 11 2003 schwab@suse.de - Update to automake 1.8. -* Mon Nov 10 2003 - schwab@suse.de +* Mon Nov 10 2003 schwab@suse.de - Update to automake 1.7.9. -* Tue Oct 07 2003 - schwab@suse.de +* Tue Oct 07 2003 schwab@suse.de - Update to automake 1.7.8. -* Mon Sep 08 2003 - schwab@suse.de +* Mon Sep 08 2003 schwab@suse.de - Update to automake 1.7.7. -* Wed Jul 16 2003 - sbrabec@suse.cz +* Wed Jul 16 2003 sbrabec@suse.cz - Added support for /usr/share/aclocal/dirlist. -* Fri Jul 11 2003 - schwab@suse.de +* Fri Jul 11 2003 schwab@suse.de - Update to automake 1.7.6. -* Tue Jun 10 2003 - schwab@suse.de +* Tue Jun 10 2003 schwab@suse.de - Update to automake 1.7.5. -* Mon May 12 2003 - schwab@suse.de +* Mon May 12 2003 schwab@suse.de - Add %%defattr. -* Fri Apr 25 2003 - schwab@suse.de +* Fri Apr 25 2003 schwab@suse.de - Update to automake 1.7.3. -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Mon Apr 07 2003 - schwab@suse.de +* Mon Apr 07 2003 schwab@suse.de - Only delete info entries when removing last version. -* Thu Feb 06 2003 - schwab@suse.de +* Thu Feb 06 2003 schwab@suse.de - Use %%install_info. -* Mon Jan 20 2003 - schwab@suse.de +* Mon Jan 20 2003 schwab@suse.de - Fix python macros properly. -* Fri Dec 06 2002 - schwab@suse.de +* Fri Dec 06 2002 schwab@suse.de - Update to automake 1.7.2. * Many bug fixes. -* Thu Nov 21 2002 - schwab@suse.de +* Thu Nov 21 2002 schwab@suse.de - Fix ansi2knr option. -* Mon Nov 18 2002 - ro@suse.de +* Mon Nov 18 2002 ro@suse.de - use /.buildenv like /etc/SuSE-release -* Fri Sep 27 2002 - schwab@suse.de +* Fri Sep 27 2002 schwab@suse.de - Update to automake 1.7. -* Tue Sep 17 2002 - ro@suse.de +* Tue Sep 17 2002 ro@suse.de - removed bogus self-provides -* Mon Aug 05 2002 - schwab@suse.de +* Mon Aug 05 2002 schwab@suse.de - Update to automake 1.6.3. * Support for AM_INIT_GETTEXT([external]) * Bug fixes -* Thu Jun 20 2002 - schwab@suse.de +* Thu Jun 20 2002 schwab@suse.de - Fix python macros for lib64. -* Sat Jun 15 2002 - schwab@suse.de +* Sat Jun 15 2002 schwab@suse.de - Update to automake 1.6.2. * Bug fix release. -* Fri Apr 12 2002 - schwab@suse.de +* Fri Apr 12 2002 schwab@suse.de - Update to automake 1.6.1. -* Fri Mar 29 2002 - schwab@suse.de +* Fri Mar 29 2002 schwab@suse.de - Fix typo check. - Disable libtool vs. normal check. - Make dependency generation work with KDE. -* Mon Mar 11 2002 - schwab@suse.de +* Mon Mar 11 2002 schwab@suse.de - Add versioned links to automake and aclocal. -* Thu Mar 07 2002 - schwab@suse.de +* Thu Mar 07 2002 schwab@suse.de - Update to automake 1.6. -* Wed Jan 23 2002 - schwab@suse.de +* Wed Jan 23 2002 schwab@suse.de - Fix nonportable test option in config.guess. -* Sun Dec 16 2001 - adrian@suse.de +* Sun Dec 16 2001 adrian@suse.de - fix config.guess to recognize SGI mips systems as big endian systems - bzip2 sources -* Mon Aug 27 2001 - schwab@suse.de +* Mon Aug 27 2001 schwab@suse.de - Update to automake 1.5. -* Thu Aug 09 2001 - ro@suse.de +* Thu Aug 09 2001 ro@suse.de - fixed problem when installing lisp files -* Thu Jul 19 2001 - schwab@suse.de +* Thu Jul 19 2001 schwab@suse.de - Update to automake 1.4-p5. -* Tue Jun 12 2001 - olh@suse.de +* Tue Jun 12 2001 olh@suse.de - recognize ppc64 -* Tue Jun 12 2001 - olh@suse.de +* Tue Jun 12 2001 olh@suse.de - fix typo in automake-1.4-SuSE.patch -* Mon Jun 11 2001 - schwab@suse.de +* Mon Jun 11 2001 schwab@suse.de - Recognize AC_PROG_LIBTOOL as well as AM_PROG_LIBTOOL. -* Mon Jun 11 2001 - schwab@suse.de +* Mon Jun 11 2001 schwab@suse.de - Update to automake 1.4-p4. -* Sat May 26 2001 - schwab@suse.de +* Sat May 26 2001 schwab@suse.de - Update to automake 1.4-p2. -* Wed May 09 2001 - schwab@suse.de +* Wed May 09 2001 schwab@suse.de - Update to automake 1.4-p1. -* Fri May 04 2001 - schwab@suse.de +* Fri May 04 2001 schwab@suse.de - Fix automake script for libtool 1.4. -* Fri Mar 30 2001 - schwab@suse.de +* Fri Mar 30 2001 schwab@suse.de - config.sub: don't try to fill missing parts by looking at the host system. -* Thu Feb 15 2001 - schwab@suse.de +* Thu Feb 15 2001 schwab@suse.de - Update config.{guess,sub} to latest version. -* Wed Sep 13 2000 - schwab@suse.de +* Wed Sep 13 2000 schwab@suse.de - Add bzip2 patch from kkaempf@suse.de. -* Mon Aug 21 2000 - werner@suse.de +* Mon Aug 21 2000 werner@suse.de - Use vendor within config.sub even for s390 -* Mon May 01 2000 - kukuk@suse.de +* Mon May 01 2000 kukuk@suse.de - Use mandir und infodir macro -* Wed Mar 29 2000 - bk@suse.de +* Wed Mar 29 2000 bk@suse.de - updated config.guess and config.sub for s390 -* Wed Mar 01 2000 - werner@suse.de +* Wed Mar 01 2000 werner@suse.de - Add arm/ppc patch from teTeX sources - Make VENDOR=suse if /etc/SuSE-release exists, remove `-gnu', and use $VERNDOR for all Linux architectures. -* Tue Feb 15 2000 - schwab@suse.de +* Tue Feb 15 2000 schwab@suse.de - Update config.{guess,sub} to latest version. -* Thu Jan 20 2000 - kukuk@suse.de +* Thu Jan 20 2000 kukuk@suse.de - Move /usr/{info,man} -> /usr/share/{info,man} -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Aug 26 1999 - kukuk@suse.de +* Thu Aug 26 1999 kukuk@suse.de - Add automake.1, aclocal.1 and other documentation - Add make check to build section -* Fri Feb 26 1999 - florian@suse.de +* Fri Feb 26 1999 florian@suse.de - update to 1.4 -* Fri Jun 19 1998 - ro@suse.de +* Fri Jun 19 1998 ro@suse.de - update to 1.3 using dif from jurix -* Wed Jun 25 1997 - florian@suse.de +* Wed Jun 25 1997 florian@suse.de - update to version 1.2 -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de new version 1.0 diff --git a/lzma.diff b/lzma.diff deleted file mode 100644 index 33eed05..0000000 --- a/lzma.diff +++ /dev/null @@ -1,142 +0,0 @@ -2007-10-09 Jim Meyering - - Add lzma compression support. - * automake.in (handle_dist): Recognize dist-lzma. - (make_paragraphs): Map LZMA to dist-lzma. - * doc/automake.texi (Dist): Add dist-lzma. - (Options): Likewise. - * lib/Automake/Options.pm (_process_option_list): - * lib/am/distdir.am (dist-lzma): New rule. - (dist dist-all): Add command to create an lzma-compressed tarball. - (distcheck): Handle lzma-compressed tarballs just like the others. - Suggestion from Karl Berry. - -=================================================================== -RCS file: /cvs/automake/automake/automake.in,v -retrieving revision 1.1649 -retrieving revision 1.1650 -diff -u -r1.1649 -r1.1650 ---- automake/automake.in 2007/09/30 04:18:20 1.1649 -+++ automake/automake.in 2007/10/09 14:52:19 1.1650 -@@ -3613,7 +3613,7 @@ - { - my $archive_defined = option 'no-dist-gzip' ? 0 : 1; - $archive_defined ||= -- grep { option "dist-$_" } ('shar', 'zip', 'tarZ', 'bzip2'); -+ grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzma); - error (option 'no-dist-gzip', - "no-dist-gzip specified but no dist-* specified, " - . "at least one archive format must be enabled") -@@ -6446,6 +6446,7 @@ - 'MAINTAINER-MODE' - => $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '', - -+ 'LZMA' => !! option 'dist-lzma', - 'BZIP2' => !! option 'dist-bzip2', - 'COMPRESS' => !! option 'dist-tarZ', - 'GZIP' => ! option 'no-dist-gzip', -=================================================================== -RCS file: /cvs/automake/automake/doc/automake.texi,v -retrieving revision 1.171 -retrieving revision 1.172 -diff -u -r1.171 -r1.172 ---- automake/doc/automake.texi 2007/08/19 07:46:52 1.171 -+++ automake/doc/automake.texi 2007/10/09 14:52:20 1.172 -@@ -8082,6 +8082,11 @@ - Generate a gzip tar archive of the distribution. - @trindex dist-gzip - -+@item @code{dist-lzma} -+Generate a lzma tar archive of the distribution. lzma archives are -+frequently smaller than @command{bzip2}-compressed archives. -+@trindex dist-lzma -+ - @item @code{dist-shar} - Generate a shar archive of the distribution. - @trindex dist-shar -@@ -8369,6 +8374,12 @@ - Hook @code{dist-bzip2} to @code{dist}. - @trindex dist-bzip2 - -+@item @option{dist-lzma} -+@cindex Option, @option{dist-lzma} -+@opindex dist-lzma -+Hook @code{dist-lzma} to @code{dist}. -+@trindex dist-lzma -+ - @item @option{dist-shar} - @cindex Option, @option{dist-shar} - @opindex dist-shar -@@ -8540,7 +8551,7 @@ - These three mutually exclusive options select the tar format to use - when generating tarballs with @samp{make dist}. (The tar file created - is then compressed according to the set of @option{no-dist-gzip}, --@option{dist-bzip2} and @option{dist-tarZ} options in use.) -+@option{dist-bzip2}, @option{dist-lzma} and @option{dist-tarZ} options in use.) - - These options must be passed as argument to @code{AM_INIT_AUTOMAKE} - (@pxref{Macros}) because they can require additional configure checks. -@@ -12074,4 +12085,4 @@ - @c LocalWords: LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO - @c LocalWords: unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS - @c LocalWords: LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS --@c LocalWords: barexec Pinard's automatize initialize -+@c LocalWords: barexec Pinard's automatize initialize lzma -=================================================================== -RCS file: /cvs/automake/automake/lib/Automake/Options.pm,v -retrieving revision 1.8 -retrieving revision 1.9 -diff -u -r1.8 -r1.9 ---- automake/lib/Automake/Options.pm 2007/07/07 11:23:27 1.8 -+++ automake/lib/Automake/Options.pm 2007/10/09 14:52:20 1.9 -@@ -1,4 +1,4 @@ --# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -261,6 +261,7 @@ - elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo' - || $_ eq 'dist-shar' || $_ eq 'dist-zip' - || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2' -+ || $_ eq 'dist-lzma' - || $_ eq 'no-dist-gzip' || $_ eq 'no-dist' - || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex' - || $_ eq 'readme-alpha' || $_ eq 'check-news' -=================================================================== -RCS file: /cvs/automake/automake/lib/am/distdir.am,v -retrieving revision 1.70 -retrieving revision 1.71 -diff -u -r1.70 -r1.71 ---- automake/lib/am/distdir.am 2007/07/07 11:23:28 1.70 -+++ automake/lib/am/distdir.am 2007/10/09 14:52:20 1.71 -@@ -259,6 +259,12 @@ - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -+?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma -+.PHONY: dist-lzma -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ - ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z - .PHONY: dist-tarZ - dist-tarZ: distdir -@@ -295,6 +301,7 @@ - dist dist-all: distdir - ?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - ?BZIP2? tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - ?COMPRESS? tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - ?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - ?ZIP? -rm -f $(distdir).zip -@@ -320,6 +327,8 @@ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \