summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--macosx/Makefile5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 428ee21..3f56fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-17 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Makefile: added var to allow overriding of tclsh used
+ during html help building (Landon Fuller).
+
2003-07-16 Mumit Khan <khan@nanotech.wisc.edu>
* generic/tclIOUtil.c (SetFsPathFromAny): Add Cygwin specific
diff --git a/macosx/Makefile b/macosx/Makefile
index 3ae458a..59aa677 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
# Makefile to build Tcl on Mac OS X packaged as a Framework
# uses standard unix build system in tcl/unix
#
-# RCS: @(#) $Id: Makefile,v 1.5.2.1 2003/07/15 01:15:51 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.5.2.2 2003/07/18 01:06:16 das Exp $
#
########################################################################################################
@@ -87,6 +87,7 @@ PRODUCT_LONGVERSION := $(shell eval $$(grep '^TCL_PATCH_LEVEL=' ${UNIX_DIR}/conf
PRIVATE_HEADERS := tclInt.h tclIntDecls.h tclIntPlatDecls.h tclMath.h
TARGETS := tclsh tcltest
TCLSH := tclsh${PRODUCT_VERSION}
+TCL_EXE ?= ${SYMROOT}/${TCLSH}
DYLIB_INSTALL_PATH ?= ${INSTALL_PATH}
@@ -175,7 +176,7 @@ ifeq (${BUILD_STYLE},Deployment)
# build html documentation
export DYLD_FRAMEWORK_PATH=${SYMROOT} && \
${MAKE} -C ${OBJ_DIR} html-tcl \
- DISTDIR=${INSTALL_ROOT}${DOCDIR} TCL_EXE=${SYMROOT}/${TCLSH} && \
+ DISTDIR=${INSTALL_ROOT}${DOCDIR} TCL_EXE=${TCL_EXE} && \
cd ${INSTALL_ROOT}${DOCDIR} && ln -fs contents.htm html/${PRODUCT_NAME}TOC.html && \
rm -fr "${PRODUCT_NAME}" && mv -f html "${PRODUCT_NAME}"
endif