Browse Source

Merge "Defalt to using sh instead of ksh in makefiles, but allow override by user."

Jenkins 5 years ago
parent
commit
5a3a0f0581
2 changed files with 10 additions and 2 deletions
  1. 8
    2
      doc/source/global.make
  2. 2
    0
      doc/source/makefile

+ 8
- 2
doc/source/global.make View File

@@ -1,6 +1,13 @@
1 1
 # global things needed by all make files -- mostly meta rules
2 2
 
3
-SHELL = ksh
3
+# allow user to override with better shell when desired.
4
+# unfortunately (g)make overrides SHELL rather than importing it; pull from MK_SHELL if set
5
+ifneq ($(MK_SHELL),)
6
+	SHELL := $(MK_SHELL)
7
+else
8
+	SHELL := sh
9
+endif
10
+
4 11
 
5 12
 # allows the use of ../ in include statements
6 13
 env = openout_any=a openin_any=a
@@ -14,4 +21,3 @@ env = openout_any=a openin_any=a
14 21
 # xfig used to produce/maintain figures. this converts to eps
15 22
 %.eps: %.fig
16 23
 	fig2dev -L eps <$< >$@
17
-

+ 2
- 0
doc/source/makefile View File

@@ -1,6 +1,8 @@
1 1
 # simple makefile to build all doc from the subdirectories below and to 
2 2
 # pull the final pdf files to this directory.
3 3
 
4
+include global.make
5
+
4 6
 sub_dirs = ic_user
5 7
 
6 8
 # buld and prompte the final pdf to this directory

Loading…
Cancel
Save