{"thread":{"id":"18442","subject":"[PATCH] documenation: Makefile accounts for SHELL_PATH setting","startedAt":"2009-03-21T02:04:33Z","lastAt":"2009-03-21T02:04:33Z","messageCount":1,"participants":["Ben Walton"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"108778","messageId":"1237601073-22670-1-git-send-email-bwalton@artsci.utoronto.ca","threadId":"18442","inReplyTo":null,"subject":"[PATCH] documenation: Makefile accounts for SHELL_PATH setting","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2009-03-21T02:04:33Z","receivedAt":"2009-03-21T02:04:33Z","isPatch":true,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Take SHELL_PATH into account, if set, in Documentation/Makefile.  This\nallows the caller to provide a shell capable of running the install\nscripts on systems where sh is not bash.\n\nSigned-off-by: Ben Walton <bwalton@artsci.utoronto.ca>\n---\n Documentation/Makefile |   17 +++++++++++------\n 1 files changed, 11 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 144ec32..2eb5a72 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -67,6 +67,11 @@ ASCIIDOC_EXTRA += -a docbook-xsl-172\n MANPAGE_XSL = manpage-1.72.xsl\n endif\n \n+#retain original (but broken) behaviour if SHELL_PATH isn't overridden\n+ifndef SHELL_PATH\n+\tSHELL_PATH = sh\n+endif\n+\n #\n # Please note that there is a minor bug in asciidoc.\n # The version after 6.0.3 _will_ include the patch found here:\n@@ -116,7 +121,7 @@ install-pdf: pdf\n \t$(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir)\n \n install-html: html\n-\tsh ./install-webdoc.sh $(DESTDIR)$(htmldir)\n+\t$(SHELL_PATH) ./install-webdoc.sh $(DESTDIR)$(htmldir)\n \n ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE\n \t$(MAKE) -C ../ GIT-VERSION-FILE\n@@ -178,7 +183,7 @@ user-manual.xml: user-manual.txt user-manual.conf\n \n technical/api-index.txt: technical/api-index-skel.txt \\\n \ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n-\tcd technical && sh ./api-index.sh\n+\tcd technical && $(SHELL_PATH) ./api-index.sh\n \n $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt\n \t$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \\\n@@ -220,7 +225,7 @@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml\n \n howto-index.txt: howto-index.sh $(wildcard howto/*.txt)\n \t$(RM) $@+ $@\n-\tsh ./howto-index.sh $(wildcard howto/*.txt) >$@+\n+\t$(SHELL_PATH) ./howto-index.sh $(wildcard howto/*.txt) >$@+\n \tmv $@+ $@\n \n $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt\n@@ -234,14 +239,14 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt\n \tmv $@+ $@\n \n install-webdoc : html\n-\tsh ./install-webdoc.sh $(WEBDOC_DEST)\n+\t$(SHELL_PATH) ./install-webdoc.sh $(WEBDOC_DEST)\n \n quick-install: quick-install-man\n \n quick-install-man:\n-\tsh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)\n+\t$(SHELL_PATH) ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)\n \n quick-install-html:\n-\tsh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)\n+\t$(SHELL_PATH) ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)\n \n .PHONY: .FORCE-GIT-VERSION-FILE\n-- \n1.6.0.5\n"}]}