From a40256c1a9aacc1613461533936bc166abe15b67 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Tue, 22 Sep 2009 16:55:35 -0700 Subject: [PATCH] More reliable Mercurial node ids. --- src/ChangeLog | 7 +++++++ src/Makefile.am | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 + * 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) >> $@ -- 2.39.2