From c539ced1283607bc7f3827af9c60b11017e1993e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 22 Jan 2008 08:56:18 +0000 Subject: [PATCH] Preps for automake-1.10.1 --- contrib/crossrpms/autotools/automake.add | 4 ++-- contrib/crossrpms/autotools/automake.am | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add index ba8c72cb77..c4e0903d76 100644 --- a/contrib/crossrpms/autotools/automake.add +++ b/contrib/crossrpms/autotools/automake.add @@ -1,5 +1,5 @@ -%define rpmvers 1.10 -%define srcvers 1.10 +%define rpmvers @AUTOMAKE_VERS@ +%define srcvers @AUTOMAKE_VERS@ %define amvers 1.10 %if "%{_prefix}" != "/usr" diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am index bcf7dc4648..bd0b33c3e1 100644 --- a/contrib/crossrpms/autotools/automake.am +++ b/contrib/crossrpms/autotools/automake.am @@ -6,6 +6,7 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in cat $(AUTOMAKE_SUBPACKAGES) | sed \ + -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \ -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@ CLEANFILES += automake.spec.in