Author: cazfi
Date: Thu Jan 1 23:54:46 2015
New Revision: 27480
URL: http://svn.gna.org/viewcvs/freeciv?rev=27480&view=rev
Log:
Replaced creation of bz2 compressed tarballs with xz-compressed one.
Minimum automake version bumped to 1.11 for this to work.
See patch #3301
Modified:
trunk/INSTALL
trunk/Makefile.am
trunk/autogen.sh
trunk/configure.ac
Modified: trunk/INSTALL
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/INSTALL?rev=27480&r1=27479&r2=27480&view=diff
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL Thu Jan 1 23:54:46 2015
@@ -86,7 +86,7 @@
Autoconf is required to create configure from configure.ac.
- - GNU automake version 1.9 or better
+ - GNU automake version 1.11 or better
Automake is required to create the various Makefile.in from
Makefile.am.
Modified: trunk/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=27480&r1=27479&r2=27480&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Jan 1 23:54:46 2015
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 -I dependencies/m4
-AM_DIST_FORMATS = gzip bzip2 zip
+AM_DIST_FORMATS = gzip xz zip
if CLIENT
CSUBDIRS = client
Modified: trunk/autogen.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/autogen.sh?rev=27480&r1=27479&r2=27480&view=diff
==============================================================================
--- trunk/autogen.sh (original)
+++ trunk/autogen.sh Thu Jan 1 23:54:46 2015
@@ -233,9 +233,9 @@
AUTOHEADER=$REALPKGNAME
# automake and aclocal version numbers must be kept in sync
-real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 9 || DIE=1
+real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 11 ||
DIE=1
AUTOMAKE=$REALPKGNAME
-real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 9 || DIE=1
+real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 11 || DIE=1
ACLOCAL=$REALPKGNAME
real_package_name "libtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/"; 1 5 2 ||
DIE=1
LIBTOOLIZE=$REALPKGNAME
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=27480&r1=27479&r2=27480&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jan 1 23:54:46 2015
@@ -67,7 +67,7 @@
[Distribution this freeciv is built for])
dnl Initialize automake stuff
-AM_INIT_AUTOMAKE([subdir-objects dist-bzip2 dist-zip])
+AM_INIT_AUTOMAKE([subdir-objects dist-zip dist-xz])
dnl Use Automake 1.11 silent rules by default if available
dnl verbose build using make V=1
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
