Handle the version stuff even when building completely outside

the srcdir.

bk: 3bed760atsxo25kD7qStXtTas1QsvQ

diff --git a/Makefile.am b/Makefile.am
index e2af637535252b309106a73452af9af9d311d7a1..e9f58566bc9de03a95f440ce334357b57578dda7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,10 +63,16 @@ BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
 $(srcdir)/COPYRIGHT: html/copyright.htm
        ( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
 
+# HMS: The next bit is still suboptimal.  If bk is present but this NTP
+# repo is not a bk repo, we'll get an error message from the prs command.
+# Unfortunately, I haven't found the necessary magic to redirect this error
+# output to /dev/null under ancient/unique shells like the one Ultrix uses.
+# We'll also get an error of srcdir or version is unwritable.
 $(srcdir)/version: FRC.version
        -(bk version) >/dev/null 2>&1 && \
+           cd $(srcdir) && \
             x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
-           case "$$x" in '') ;; *) echo $$x > $(srcdir)/version ;; esac
+           case "$$x" in '') ;; *) echo $$x > version ;; esac
 
 dist-hook:
        @find $(distdir) -type d -name CVS -print | xargs rm -rf