1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

More reliable Mercurial node ids.

This commit is contained in:
Micah Cowan 2009-09-22 16:55:35 -07:00
parent a5739c1991
commit a40256c1a9
2 changed files with 9 additions and 1 deletions

View File

@ -1,5 +1,12 @@
2009-09-22 Micah Cowan <micah@cowan.name> 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 * openssl.c (ssl_check_certificate): Avoid reusing the same buffer
space for successive quoted arguments. Thanks to Steven Schweda space for successive quoted arguments. Thanks to Steven Schweda
for pointing out the problem. for pointing out the problem.

View File

@ -73,7 +73,8 @@ version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am \
echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@ echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
echo '' >> $@ echo '' >> $@
echo 'const char *version_string = "@VERSION@"' >> $@ 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 ';' >> $@
echo 'const char *compilation_string = "'$(COMPILE)'";' \ echo 'const char *compilation_string = "'$(COMPILE)'";' \
| $(ESCAPEQUOTE) >> $@ | $(ESCAPEQUOTE) >> $@