[PATCH 2/3] Refactoring: less AC_SUBST'd stuff in automake.in.

[Stefano Lattarini]

* lib/Automake/Config.in ($PACKAGE_URL): New AC_SUBST'd variable.
(@EXPORT): Update.
* lib/Automake/Makefile.am (Config.pm): Update substitution rule.
* automake.in (usage): Use `$PACKAGE_BUGREPORT' and `$PACKAGE_URL'
rather than address@hidden@' and address@hidden@'
* aclocal.in (usage): Likewise.
---
 ChangeLog                |    8 ++++++++
 aclocal.in               |    6 +++---
 automake.in              |    8 ++++----
 lib/Automake/Config.in   |    5 +++--
 lib/Automake/Makefile.am |    1 +
 lib/Automake/Makefile.in |    1 +
 6 files changed, 20 insertions(+), 9 deletions(-)

From f6ed4f36fdbf4b1da9daf0dccd2c00f4c75e3163 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sun, 26 Sep 2010 18:36:05 +0200
Subject: [PATCH 2/3] Refactoring: less AC_SUBST'd stuff in automake.in.

* lib/Automake/Config.in ($PACKAGE_URL): New AC_SUBST'd variable.
(@EXPORT): Update.
* lib/Automake/Makefile.am (Config.pm): Update substitution rule.
* automake.in (usage): Use `$PACKAGE_BUGREPORT' and `$PACKAGE_URL'
rather than address@hidden@' and address@hidden@'
* aclocal.in (usage): Likewise.
---
 ChangeLog                |    8 ++++++++
 aclocal.in               |    6 +++---
 automake.in              |    8 ++++----
 lib/Automake/Config.in   |    5 +++--
 lib/Automake/Makefile.am |    1 +
 lib/Automake/Makefile.in |    1 +
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9cc0c94..4e03b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-26  Stefano Lattarini  <address@hidden>
 
+       Refactoring: less AC_SUBST'd stuff in automake.in.
+       * lib/Automake/Config.in ($PACKAGE_URL): New AC_SUBST'd variable.
+       (@EXPORT): Update.
+       * lib/Automake/Makefile.am (Config.pm): Update substitution rule.
+       * automake.in (usage): Use `$PACKAGE_BUGREPORT' and `$PACKAGE_URL'
+       rather than address@hidden@' and address@hidden@'
+       * aclocal.in (usage): Likewise.
+
        Refactoring: new module `Automake::Language'.
        * lib/Automake/Language.pm: New module, extracted from script
        `automake.in'.
diff --git a/aclocal.in b/aclocal.in
index b5c2c41..3a5a59a 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -897,10 +897,10 @@ Warning categories include:
   `none'          turn off all the warnings
   `error'         treat warnings as errors
 
-" . 'Report bugs to <@PACKAGE_BUGREPORT@>.
-GNU Automake home page: <@PACKAGE_URL@>.
+Report bugs to <$PACKAGE_BUGREPORT>.
+GNU Automake home page: <$PACKAGE_URL>.
 General help using GNU software: <http://www.gnu.org/gethelp/>.
-';
+";
 
   exit $status;
 }
diff --git a/automake.in b/automake.in
index 74227a9..02d1c37 100755
--- a/automake.in
+++ b/automake.in
@@ -8298,11 +8298,11 @@ Library files:
        write;
     }
 
-    print '
-Report bugs to <@PACKAGE_BUGREPORT@>.
-GNU Automake home page: <@PACKAGE_URL@>.
+    print "
+Report bugs to <$PACKAGE_BUGREPORT>.
+GNU Automake home page: <$PACKAGE_URL>.
 General help using GNU software: <http://www.gnu.org/gethelp/>.
-';
+";
 
     # --help always returns 0 per GNU standards.
     exit 0;
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 7e87044..6ef9b07 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -22,13 +22,14 @@ use 5.006;
 require Exporter;
 
 our @ISA = qw (Exporter);
-our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION $libdir
-                 $perl_threads);
+our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_URL $PACKAGE_BUGREPORT
+                  $VERSION $libdir $perl_threads);
 
 # Parameters set by configure.  Not to be changed.  NOTE: assign
 # VERSION as string so that e.g. version 0.30 will print correctly.
 our $APIVERSION = '@APIVERSION@';
 our $PACKAGE = '@PACKAGE@';
+our $PACKAGE_URL = '@PACKAGE_URL@';
 our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
 our $VERSION = '@VERSION@';
 our $libdir = '@datadir@/@address@hidden@APIVERSION@';
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index 6218379..96e3d53 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -53,6 +53,7 @@ CLEANFILES = $(nodist_perllib_DATA)
 do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
   -e 's,address@hidden@],$(APIVERSION),g' \
   -e 's,address@hidden@],$(PACKAGE),g' \
+  -e 's,address@hidden@],$(PACKAGE_URL),g' \
   -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
   -e 's,address@hidden@],$(PERL),g' \
   -e 's,address@hidden@],$(PERL_THREADS),g' \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 31df517..45bed7f 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -255,6 +255,7 @@ CLEANFILES = $(nodist_perllib_DATA)
 do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
   -e 's,address@hidden@],$(APIVERSION),g' \
   -e 's,address@hidden@],$(PACKAGE),g' \
+  -e 's,address@hidden@],$(PACKAGE_URL),g' \
   -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
   -e 's,address@hidden@],$(PERL),g' \
   -e 's,address@hidden@],$(PERL_THREADS),g' \
-- 
1.7.1