From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 26 Jun 2010 20:23:31 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

f54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e
diff --cc automake.in
index baab72167,381202b46..97280a913
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in
diff --cc configure.ac
index bb22e1ce0,de4583d67..079525d62
--- a/configure.ac
+++ b/configure.ac
@@@ -16,8 -16,11 +16,11 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -AC_INIT([GNU Automake], [1.11], [bug-automake@gnu.org])
 +AC_INIT([GNU Automake], [1.11a], [bug-automake@gnu.org])
  
+ m4_ifndef([AC_PACKAGE_URL],
+ 	  [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])])
+ 
  AC_CONFIG_SRCDIR(automake.in)
  AC_CONFIG_AUX_DIR(lib)