Attachment 150101 Details for Bug 225299 – patch configure and Makefile.in to avoid rerunning autotools

[patch] patch configure and Makefile.in to avoid rerunning autotools

automake15-configure-versioning.patch (text/plain), 3.55 KB, created by Patrice Dumas on 2007-03-14 23:18:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-03-14 23:18:13 UTC

Size: 3.55 KB

patch

obsolete

>--- automake-1.5/Makefile.in.versioning	2001-08-23 07:49:54.000000000 +0200
>+++ automake-1.5/Makefile.in	2007-03-14 23:50:19.000000000 +0100
>@@ -56,6 +56,7 @@
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
> AMTAR = @AMTAR@
>+APIVERSION = @APIVERSION@
> AWK = @AWK@
> DEPDIR = @DEPDIR@
> EXEEXT = @EXEEXT@
>@@ -251,7 +252,7 @@
> #     (which will cause the Makefiles to be regenerated when you run `make');
> # (2) otherwise, pass the desired values on the `make' command line.
> $(RECURSIVE_TARGETS):
>-	@set fnord $(MAKEFLAGS); amf=$$2; \
>+	@set fnord $$MAKEFLAGS; amf=$$2; \
> 	dot_seen=no; \
> 	target=`echo $@ | sed s/-recursive//`; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -271,7 +272,7 @@
> 
> mostlyclean-recursive clean-recursive distclean-recursive \
> maintainer-clean-recursive:
>-	@set fnord $(MAKEFLAGS); amf=$$2; \
>+	@set fnord $$MAKEFLAGS; amf=$$2; \
> 	dot_seen=no; \
> 	case "$@" in \
> 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
>--- automake-1.5/lib/Automake/Makefile.in.versioning	2001-08-23 07:49:55.000000000 +0200
>+++ automake-1.5/lib/Automake/Makefile.in	2007-03-14 23:47:51.000000000 +0100
>@@ -56,6 +56,7 @@
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
> AMTAR = @AMTAR@
>+APIVERSION = @APIVERSION@
> AWK = @AWK@
> DEPDIR = @DEPDIR@
> EXEEXT = @EXEEXT@
>--- automake-1.5/lib/Makefile.in.versioning	2001-08-23 07:49:55.000000000 +0200
>+++ automake-1.5/lib/Makefile.in	2007-03-14 23:48:55.000000000 +0100
>@@ -56,6 +56,7 @@
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
> AMTAR = @AMTAR@
>+APIVERSION = @APIVERSION@
> AWK = @AWK@
> DEPDIR = @DEPDIR@
> EXEEXT = @EXEEXT@
>@@ -145,7 +146,7 @@
> #     (which will cause the Makefiles to be regenerated when you run `make');
> # (2) otherwise, pass the desired values on the `make' command line.
> $(RECURSIVE_TARGETS):
>-	@set fnord $(MAKEFLAGS); amf=$$2; \
>+	@set fnord $$MAKEFLAGS; amf=$$2; \
> 	dot_seen=no; \
> 	target=`echo $@ | sed s/-recursive//`; \
> 	list='$(SUBDIRS)'; for subdir in $$list; do \
>@@ -165,7 +166,7 @@
> 
> mostlyclean-recursive clean-recursive distclean-recursive \
> maintainer-clean-recursive:
>-	@set fnord $(MAKEFLAGS); amf=$$2; \
>+	@set fnord $$MAKEFLAGS; amf=$$2; \
> 	dot_seen=no; \
> 	case "$@" in \
> 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
>--- automake-1.5/lib/am/Makefile.in.versioning	2001-08-23 07:49:55.000000000 +0200
>+++ automake-1.5/lib/am/Makefile.in	2007-03-14 23:47:28.000000000 +0100
>@@ -56,6 +56,7 @@
> PRE_UNINSTALL = :
> POST_UNINSTALL = :
> AMTAR = @AMTAR@
>+APIVERSION = @APIVERSION@
> AWK = @AWK@
> DEPDIR = @DEPDIR@
> EXEEXT = @EXEEXT@
>--- automake-1.5/configure.versioning	2001-08-23 07:49:52.000000000 +0200
>+++ automake-1.5/configure	2007-03-15 00:03:12.000000000 +0100
>@@ -793,7 +793,7 @@
> fi
> 
> # Define the identity of the package.
>-PACKAGE=automake
>+PACKAGE=automake-1.5
> VERSION=1.5
> cat >> confdefs.h <<EOF
> #define PACKAGE "$PACKAGE"
>@@ -843,6 +843,16 @@
> # some platforms.
> 
> 
>+# The API version is the base version.  We must guarantee
>+# compatibility for all releases with the same API version.
>+# Our current rule is that:
>+# * All releases, including the prereleases, in an X.Y series
>+#   are compatible.  So 1.5.1c is compatible with 1.5.
>+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
>+#   aren't the same.
>+APIVERSION=`echo "$VERSION" | sed -e 's/^$[[0-9]]*\.[[0-9]]*[[a-z]]?$.*$/\1/'`
>+
>+
> ACLOCAL="`pwd`/aclocal --acdir=m4"
> # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
> # what we want for perllibdir and libdir.
>@@ -1064,6 +1074,7 @@
> s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
> s%@DEPDIR@%$DEPDIR%g
> s%@PERL@%$PERL%g
>+s%@APIVERSION@%$APIVERSION%g
> 
> CEOF
> EOF

Actions: View | Diff

Attachments on bug 225299: 150101 | 153256