summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Daniels <daniels@research.att.com>2013-09-18 10:56:17 -0400
committerScott Daniels <daniels@research.att.com>2013-09-18 12:46:43 -0400
commitae30131299029e0a9519cdbb7a91888b428d1b53 (patch)
tree07b8907895293acc1398071f167b974bf14964e7
parent4451cff7bcb022b669ab13307c523de5c3b5bb7b (diff)
Defalt to using sh instead of ksh in makefiles, but allow override by user.
Notes
Notes (review): Verified+2: Jenkins Approved+1: Changbin Liu <changbin.liu@gmail.com> Code-Review+2: Changbin Liu <changbin.liu@gmail.com> Submitted-by: Jenkins Submitted-at: Wed, 18 Sep 2013 19:18:51 +0000 Reviewed-on: https://review.openstack.org/47181 Project: stackforge/inception Branch: refs/heads/master
-rw-r--r--doc/source/global.make10
-rw-r--r--doc/source/makefile2
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 @@
1# global things needed by all make files -- mostly meta rules 1# global things needed by all make files -- mostly meta rules
2 2
3SHELL = 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
5ifneq ($(MK_SHELL),)
6 SHELL := $(MK_SHELL)
7else
8 SHELL := sh
9endif
10
4 11
5# allows the use of ../ in include statements 12# allows the use of ../ in include statements
6env = openout_any=a openin_any=a 13env = openout_any=a openin_any=a
@@ -14,4 +21,3 @@ env = openout_any=a openin_any=a
14# xfig used to produce/maintain figures. this converts to eps 21# xfig used to produce/maintain figures. this converts to eps
15%.eps: %.fig 22%.eps: %.fig
16 fig2dev -L eps <$< >$@ 23 fig2dev -L eps <$< >$@
17
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 @@
1# simple makefile to build all doc from the subdirectories below and to 1# simple makefile to build all doc from the subdirectories below and to
2# pull the final pdf files to this directory. 2# pull the final pdf files to this directory.
3 3
4include global.make
5
4sub_dirs = ic_user 6sub_dirs = ic_user
5 7
6# buld and prompte the final pdf to this directory 8# buld and prompte the final pdf to this directory