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]

2 files changed, 2 insertions, 1 deletions

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
diff --git a/mkfiles.pl b/mkfiles.pl
index 5c91502..b1583ae 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1229,6 +1229,7 @@ if (defined $makefiles{'am'}) {
         if (defined $cflags{'am'} && $cflags{'am'}->{$obj}) {
             # This file needs to go in an archive, so that we can
             # change the compile flags as specified in Recipe
+            $use_archive = 1;
             $archivecflags{$obj} = [$cflags{'am'}->{$obj}];
         }
         if ($use_archive) {