Author: cazfi
Date: Mon Jan 2 00:18:44 2017
New Revision: 34768
URL: http://svn.gna.org/viewcvs/freeciv?rev=34768&view=rev
Log:
Set EXTRA_foo_DEPENDENCIES instead of foo_DEPENDENCIES.
Bumped minimum automake requirement to 1.11.3
See patch #7871
Modified:
trunk/INSTALL
trunk/autogen.sh
trunk/common/Makefile.am
trunk/doc/README.packaging
Modified: trunk/INSTALL
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/INSTALL?rev=34768&r1=34767&r2=34768&view=diff
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL Mon Jan 2 00:18:44 2017
@@ -99,7 +99,7 @@
Autoconf is required to create configure from configure.ac.
- - GNU automake version 1.11.2 or better
+ - GNU automake version 1.11.3 or better
Automake is required to create the various Makefile.in from
Makefile.am.
Modified: trunk/autogen.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/autogen.sh?rev=34768&r1=34767&r2=34768&view=diff
==============================================================================
--- trunk/autogen.sh (original)
+++ trunk/autogen.sh Mon Jan 2 00:18:44 2017
@@ -241,9 +241,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 11 2 ||
DIE=1
+real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 11 3 ||
DIE=1
AUTOMAKE=$REALPKGNAME
-real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 11 2 ||
DIE=1
+real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 11 3 ||
DIE=1
ACLOCAL=$REALPKGNAME
real_package_name "libtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/"; 2 2 ||
DIE=1
LIBTOOLIZE=$REALPKGNAME
Modified: trunk/common/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/Makefile.am?rev=34768&r1=34767&r2=34768&view=diff
==============================================================================
--- trunk/common/Makefile.am (original)
+++ trunk/common/Makefile.am Mon Jan 2 00:18:44 2017
@@ -130,7 +130,7 @@
EXTRA_DIST = \
generate_packets.py
-libfreeciv_la_DEPENDENCIES = \
+EXTRA_libfreeciv_la_DEPENDENCIES = \
$(top_builddir)/utility/libcivutility.la \
$(top_builddir)/common/aicore/libaicore.la \
$(top_builddir)/common/networking/libfcivnetwork.la \
Modified: trunk/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=34768&r1=34767&r2=34768&view=diff
==============================================================================
--- trunk/doc/README.packaging (original)
+++ trunk/doc/README.packaging Mon Jan 2 00:18:44 2017
@@ -19,6 +19,7 @@
or ~/.civclientrc generated by Freeciv version <= 2.1).
* Gtk2-client has been dropped completely
* Sdl1.2 Mixer support has been dropped
+* Minimum automake version is now 1.11.3
----------------------------------------------------------------------
Compatibility of modified versions
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
