From 1ee9f5f2ef37f372d336d062326906993b6e62e5 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 2 Jul 2013 06:48:26 +0000 Subject: Fix small bugs in the automake construction which were preventing the revision number from being automatically baked into the automake-built binaries. [originally from svn r9890] --- Recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Recipe') diff --git a/Recipe b/Recipe index 79098f2..69edccf 100644 --- a/Recipe +++ b/Recipe @@ -136,7 +136,7 @@ version2.def: FORCE # backtick expression. We also force rebuilding via a -D option that # makes version.o include empty.h, which we construct ourselves and # touch whenever any source file is updated. -!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir)/..; md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/../version.def; else echo "$(VER)"; fi` +!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir) && test -f manifest && md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/version.def; elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then echo "-DREVISION=\`svnversion .\`"; else echo "$(VER)"; fi` !begin am BUILT_SOURCES = empty.h CLEANFILES = empty.h -- cgit v1.1