From 98cd1f5a4b6469760944d4455c04185d571c67ed Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 2 Sep 2007 05:09:26 +0000 Subject: 2007-09-01 Gabriel Dos Reis * configure.ac.pamphlet (<>): Keep gcl directory test simple. * Makefile.pamphlet (maybe-cp-noweb-srcdir): New rule. Factored from the rule below. ($(addprefix $(axiom_build_bindir)/, notangle noweave)): Make it a prerequisite. * config/var-def.mk (WEAVE): Export. (WEAVE): Likewise. src/scripts/ 2007-09-01 Gabriel Dos Reis * document.in (TANGLE): New environment variable. Use in place nacked notangle. (WEAVE): New environment variable. Use in place of noweave. --- src/scripts/ChangeLog | 6 ++++++ src/scripts/document.in | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/scripts/ChangeLog b/src/scripts/ChangeLog index b6f55ee2..86419485 100644 --- a/src/scripts/ChangeLog +++ b/src/scripts/ChangeLog @@ -1,3 +1,9 @@ +2007-09-01 Gabriel Dos Reis + + * document.in (TANGLE): New environment variable. Use in place + nacked notangle. + (WEAVE): New environment variable. Use in place of noweave. + 2007-06-25 Gabriel Dos Reis * document.in (check_mode_value): Remove save-image support. diff --git a/src/scripts/document.in b/src/scripts/document.in index 93425720..bafdd1e2 100755 --- a/src/scripts/document.in +++ b/src/scripts/document.in @@ -237,9 +237,9 @@ if test x$do_tangle = xyes; then # Alternatively, we could initialize chunk to '*' and # unconditionally use -R"$chunk". if [ -z "$chunk" ]; then - notangle $file > $output + $TANGLE $file > $output else - notangle -R"$chunk" $file > $output + $TANGLE -R"$chunk" $file > $output fi # FIXME: Handle errors. exit $?; @@ -248,7 +248,7 @@ fi if test x$do_weave = xyes; then file=`basename $1 .pamphlet` - noweave -delay $1 > $file.tex + $WEAVE -delay $1 > $file.tex if test x$do_latex != xyes; then exit 0; fi @@ -304,8 +304,8 @@ esac if [ "$#" = "3" ]; then REDIRECT=$2 FILE=`basename $3 .pamphlet` - notangle -t8 $FILE.pamphlet >$FILE - noweave -delay $FILE.pamphlet >$FILE.tex + $TANGLE -t8 $FILE.pamphlet >$FILE + $WEAVE -delay $FILE.pamphlet >$FILE.tex latex --interaction nonstopmode $FILE.tex >$REDIRECT latex --interaction nonstopmode $FILE.tex >$REDIRECT rm -f $FILE~ @@ -318,8 +318,8 @@ if [ "$#" = "3" ]; then fi if [ "$#" = "1" ]; then FILE=`basename $1 .pamphlet` - notangle -t8 $FILE.pamphlet >$FILE - noweave -delay $FILE.pamphlet >$FILE.tex + $TANGLE -t8 $FILE.pamphlet >$FILE + $WEAVE -delay $FILE.pamphlet >$FILE.tex latex $FILE.tex latex $FILE.tex rm -f $FILE~ -- cgit v1.2.3