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. --- Makefile.in | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 62150ed2..deb3a906 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,16 +42,33 @@ stamp-rootdirs: $(axiom_build_document) .PHONY: all-noweb all-noweb: $(addprefix $(axiom_build_bindir)/, notangle noweave) -$(addprefix $(axiom_build_bindir)/, notangle noweave): +.PHONY: maybe-cp-noweb-srcdir +maybe-cp-noweb-srcdir: $(srcdir)/noweb + ## Even though out-of-source build is what we recommend, + ## noweb does not directly support that sort of build. + ## So we copy the source to the build directory. + ## We try to be nice to those who chose otherwise + ## to build directly from the OpenAxiom source dir. + if test "$(srcdir)" != "$(builddir)" -a ! -d noweb; then \ + cp -r $(srcdir)/noweb $(builddir); \ + fi + +$(addprefix $(axiom_build_bindir)/, notangle noweave): maybe-cp-noweb-srcdir + ## Noweb would like to install many things even if we + ## are not interested in those. Prepare the ground. $(mkinstalldirs) $(axiom_build_bindir) $(mkinstalldirs) $(axiom_build_libdir) $(mkinstalldirs) $(axiom_build_texdir) $(mkinstalldirs) $(axiom_build_mandir) - if test "$(srcdir)" != "$(builddir)" -a ! -d noweb; then \ - cp -r $(srcdir)/noweb $(builddir); \ - fi; $(TOUCH) $(wildcard $(builddir)/noweb/src/c/*.h) \ - $(wildcard $(builddir)/noweb/src/c/*.c) && \ + $(wildcard $(builddir)/noweb/src/c/*.c) + ## noweb's Makefile needs editing before we can build to suit + ## our needs. In particular, we must say when helper programs go, + ## where the noweb style file goes, where the man pages go (even though + ## in this specific context, they are not needed). Finally, + ## noweb insists on running `texhash' after installation, which is + ## of no practical value for us in ths specific context. We must + ## convince it not to go there. cd noweb/src && \ cat Makefile \ | sed -e "s,^BIN=.*,BIN=$(axiom_abs_build_bindir)," \ -- cgit v1.2.3