From: Micah Cowan <micah@cowan.name>
Date: Tue, 22 Sep 2009 23:55:35 +0000 (-0700)
Subject: More reliable Mercurial node ids.
X-Git-Tag: v1.13~225
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=a40256c1a9aacc1613461533936bc166abe15b67

More reliable Mercurial node ids.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f37814d5..392c2475 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2009-09-22  Micah Cowan  <micah@cowan.name>
 
+	* Makefile.am (version.c): Explicitly tell Mercurial where the
+	top-source repository should be, so it doesn't accidentally use
+	the repository for a containing directory (for instance, if the
+	user's home directory is managed by a Mercurial repo). Also
+	ensures we find the repository, even if the build directory is
+	outside the source directory.
+
 	* openssl.c (ssl_check_certificate): Avoid reusing the same buffer
 	space for successive quoted arguments. Thanks to Steven Schweda
 	for pointing out the problem.
diff --git a/src/Makefile.am b/src/Makefile.am
index 93930d14..4f463f90 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,8 @@ 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 >> $@
+	-hg log -R $(top_srcdir) -r . --template='" ({node|short})"\n' \
+	    2>/dev/null >> $@
 	echo ';' >> $@
 	echo 'const char *compilation_string = "'$(COMPILE)'";' \
 	    | $(ESCAPEQUOTE) >> $@