Chris Walker reports that if you give a trailing slash on the pathname

[sgt/agedu] / Buildscr

diff --git a/Buildscr b/Buildscr
index e885667..829468e 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -4,25 +4,30 @@
 
 module agedu
 
-# Build the man page.
-in agedu do make doc
-
 in agedu do sed '/AC_INIT/s/6.66/r$(revision)/' configure.ac > tmp.ac
 in agedu do mv tmp.ac configure.ac
-in agedu do aclocal
-in agedu do autoconf
-in agedu do autoheader
-in agedu do automake -a --foreign
-in agedu do rm -rf autom4te.cache
+in agedu do ./mkauto.sh
+
+# Build the man page. This also tests the automake setup to ensure
+# configure actually works; but we use a self-delegation (i.e. do all
+# of this in a throwaway copy of the build directory) to avoid
+# accidentally shipping any outputs of configure. Instead we return
+# only the actual man page from the delegation environment.
+delegate -
+  in agedu do ./configure
+  in agedu do make doc
+  return agedu/*.1
+enddelegate
 
 in . do cp -R agedu agedu-r$(revision)
-in . do rm agedu-r$(revision)/GNUmakefile
 in . do tar chzvf agedu-r$(revision).tar.gz agedu-r$(revision)
 
 in agedu do halibut --html=manpage.html agedu.but
+in agedu do halibut --html=tree.html tree.but
 
 deliver agedu-r$(revision).tar.gz $@
 deliver agedu/manpage.html $@
+deliver agedu/tree.html $@
 
 delegate windows
   # FIXME: Cygwin alternative?
@@ -30,4 +35,4 @@ delegate windows
   return agedu/winscan.exe
 enddelegate
 
-deliver agedu/winscan.exe $@
+deliver agedu/winscan.exe ageduscan.exe