Remove intermediate hg-id.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b9c65b40c055fda63ea4a3af74b999a8c8c0cfb..361ac9ef9ad88e1a2859d3723517ee60c8207abd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am: Remove intermediary hg-id file generation, make
+       version.c-generation more portable.
+
 2007-10-14  Micah Cowan  <micah@cowan.name>
 
        * cmpt.c, cookies.c, ftp-basic.c, ftp-ls.c, ftp.c, hash.c,

diff --git a/src/Makefile.am b/src/Makefile.am
index 361de3c70ca9cdc635b8248d6a4961a8470c4d18..f75d7460f024cd47436dac6b7ece3936c3409034 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,16 +48,11 @@ EXTRA_wget_SOURCES = mswindows.c
 LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a
 AM_CPPFLAGS = -I$(top_srcdir)/lib
 
-version.c: hg-id
+version.c:  $(wget_SOURCES) $(LDADD)
        printf '%s' 'const char *version_string = "@VERSION@' > $@
-       -HG_ID=$$(cat hg-id); [ "$$HG_ID" ] && printf '%s' " ($${HG_ID})" >> $@
+       -hg log -r tip --template=' ({node|short})' >> $@
        printf '%s\n' '";' >> $@
 
-.INTERMEDIATE: hg-id
-.PHONY: hg-id
-hg-id: $(wget_SOURCES) $(LDADD)
-       -( hg id | cut -f 1 -d ' ' ) 2>/dev/null > $@
-
 check_LIBRARIES = libunittest.a
 libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
 libunittest_a_CPPFLAGS = -DTESTING