Ben WaltonTake SHELL_PATH into account, if set, in Documentation/Makefile. This allows the caller to provide a shell capable of running the install scripts on systems where sh is not bash.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> --- Documentation/Makefile | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
Show changes to Documentation/Makefile +11 −6
diff --git a/Documentation/Makefile b/Documentation/Makefile index 144ec32..2eb5a72 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -67,6 +67,11 @@ ASCIIDOC_EXTRA += -a docbook-xsl-172 MANPAGE_XSL = manpage-1.72.xsl endif +#retain original (but broken) behaviour if SHELL_PATH isn't overridden +ifndef SHELL_PATH + SHELL_PATH = sh +endif + # # Please note that there is a minor bug in asciidoc. # The version after 6.0.3 _will_ include the patch found here: @@ -116,7 +121,7 @@ install-pdf: pdf $(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir) install-html: html - sh ./install-webdoc.sh $(DESTDIR)$(htmldir) + $(SHELL_PATH) ./install-webdoc.sh $(DESTDIR)$(htmldir) ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE $(MAKE) -C ../ GIT-VERSION-FILE @@ -178,7 +183,7 @@ user-manual.xml: user-manual.txt user-manual.conf technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) - cd technical && sh ./api-index.sh + cd technical && $(SHELL_PATH) ./api-index.sh $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt $(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ @@ -220,7 +225,7 @@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml howto-index.txt: howto-index.sh $(wildcard howto/*.txt) $(RM) $@+ $@ - sh ./howto-index.sh $(wildcard howto/*.txt) >$@+ + $(SHELL_PATH) ./howto-index.sh $(wildcard howto/*.txt) >$@+ mv $@+ $@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt @@ -234,14 +239,14 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt mv $@+ $@ install-webdoc : html - sh ./install-webdoc.sh $(WEBDOC_DEST) + $(SHELL_PATH) ./install-webdoc.sh $(WEBDOC_DEST) quick-install: quick-install-man quick-install-man: - sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) + $(SHELL_PATH) ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) quick-install-html: - sh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir) + $(SHELL_PATH) ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir) .PHONY: .FORCE-GIT-VERSION-FILE
-- 1.6.0.5