imported patch one-dot-twelve

diff --git a/configure.ac b/configure.ac
index be5618a68d7d194b9d3e11435b98dd004317b309..65ba1339d6fb9753de52fcda1479fad131275dce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_INIT([wget],
-       [1.12-devel],
+       [1.12],
        [bug-wget@gnu.org])
 AC_PREREQ(2.61)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 93930d14b6510d7316b620952096fc86129d959d..ac9c9c9986499ba61454886e396fa07b6422cd4d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,6 @@ version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am \
        echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
        echo '' >> $@
        echo 'const char *version_string = "@VERSION@"' >> $@
-       -hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
        echo ';' >> $@
        echo 'const char *compilation_string = "'$(COMPILE)'";' \
            | $(ESCAPEQUOTE) >> $@