From ae30131299029e0a9519cdbb7a91888b428d1b53 Mon Sep 17 00:00:00 2001 From: Scott Daniels Date: Wed, 18 Sep 2013 10:56:17 -0400 Subject: [PATCH] Defalt to using sh instead of ksh in makefiles, but allow override by user. Change-Id: I5c23fde4960bf31a0fd5c0ce027e0dabc8377123 --- doc/source/global.make | 10 ++++++++-- doc/source/makefile | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/source/global.make b/doc/source/global.make index c677032..41825e2 100644 --- a/doc/source/global.make +++ b/doc/source/global.make @@ -1,6 +1,13 @@ # global things needed by all make files -- mostly meta rules -SHELL = ksh +# allow user to override with better shell when desired. +# unfortunately (g)make overrides SHELL rather than importing it; pull from MK_SHELL if set +ifneq ($(MK_SHELL),) + SHELL := $(MK_SHELL) +else + SHELL := sh +endif + # allows the use of ../ in include statements env = openout_any=a openin_any=a @@ -14,4 +21,3 @@ env = openout_any=a openin_any=a # xfig used to produce/maintain figures. this converts to eps %.eps: %.fig fig2dev -L eps <$< >$@ - diff --git a/doc/source/makefile b/doc/source/makefile index 407bd42..25563b4 100644 --- a/doc/source/makefile +++ b/doc/source/makefile @@ -1,6 +1,8 @@ # simple makefile to build all doc from the subdirectories below and to # pull the final pdf files to this directory. +include global.make + sub_dirs = ic_user # buld and prompte the final pdf to this directory