diff --git a/common/makefile b/common/makefile index 9c74dd3..d3f4316 100644 --- a/common/makefile +++ b/common/makefile @@ -60,10 +60,10 @@ # Document Production ### -2HTML = rst2html -2LATEX = rst2latex --stylesheet=parskip -2ODT = rst2odt -2MAN = rst2man +2HTML = rst2html__PY__ +2LATEX = rst2latex__PY__ --stylesheet=parskip +2ODT = rst2odt__PY__ +2MAN = rst2man__PY__ DVIPS = dvips PDFLATEX = pdflatex diff --git a/tmkproject.sh b/tmkproject.sh index 438e182..0600bd0 100755 --- a/tmkproject.sh +++ b/tmkproject.sh @@ -3,9 +3,9 @@ # # Copyright (c) 2012, TundraWare Inc., Des Plaines, IL 60018 USA # All Rights Reserved. For Terms Of Use, See: mkproject-license.txt -# $Id: tmkproject.sh,v 1.103 2012/06/04 15:45:17 tundra Exp $ +# $Id: tmkproject.sh,v 1.104 2012/06/04 19:36:29 tundra Exp $ -CVSID='$Id: tmkproject.sh,v 1.103 2012/06/04 15:45:17 tundra Exp $' +CVSID='$Id: tmkproject.sh,v 1.104 2012/06/04 19:36:29 tundra Exp $' # Make sure we have a valid command line @@ -81,6 +81,15 @@ RESERVED="All Rights Reserved. For Terms Of Use See: ${LICENSE}" UPDATES="For Program Updates See: ${WEBSITE}" +# Find out whether the Restructured Text tools have an +# extension of ".py". Some installations do, some don't. + +PY=".py" +if [ -z `which rst2latex${PY}` ] +then + PY="" +fi + # Make relevant directories and go to the working directory RELEASES="Releases" @@ -108,6 +117,7 @@ -e s/__LANGUAGE__/"${LANGUAGE}"/g \ -e s/__LICENSE__/"${LICENSE}"/g \ -e s/__PROJECTNAME__/"${PROJECTNAME}"/g \ + -e s/__PY__/"${PY}"/g \ -e s/__RESERVED__/"${RESERVED}"/g \ -e s/__TYPE__/"${TYPE}"/g \ -e s/__UPDATES__/"${UPDATES}"/g \