diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2016-02-09 09:49:21 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2016-02-09 09:49:21 (GMT) |
| commit | 1b53260dc5681f1e6d394e1dc39cb70c4f15184c (patch) | |
| tree | 2c5102c77c5840b1efbea22bb889e5d2dde433a8 | |
| parent | 70a5d987d84fcf31c85cbb3188e8092618553e27 (diff) | |
| download | tk-1b53260dc5681f1e6d394e1dc39cb70c4f15184c.zip tk-1b53260dc5681f1e6d394e1dc39cb70c4f15184c.tar.gz tk-1b53260dc5681f1e6d394e1dc39cb70c4f15184c.tar.bz2 | |
(cherry-pick): Slightly more logical fix for [62a5ba7474]: tk 'make install' fails on Mac OS 10.11, which doesn't change the meaning of TCLSH_DIR
| -rw-r--r-- | macosx/GNUmakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index a69e9d9..46f76d5 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -35,7 +35,7 @@ MANDIR ?= ${PREFIX}/man TCL_BUILD_DIR ?= ${BUILD_DIR}/tcl/${BUILD_STYLE} # location of installed tcl, only used if tcl in TCL_BUILD_DIR can't be found TCL_FRAMEWORK_DIR ?= /Library/Frameworks -TCLSH_DIR ?= ${PREFIX} +TCLSH_DIR ?= ${PREFIX}/bin # set to non-empty value to install manpages in addition to html help: INSTALL_MANPAGES ?= @@ -116,7 +116,7 @@ TCL_FRAMEWORK_DIR := ${TCL_BUILD_DIR}/.. MAKE_VARS := else TCL_DIR := ${TCL_FRAMEWORK_DIR}/Tcl.framework -TCL_EXE := ${TCLSH_DIR}/bin/tclsh${TCL_VERSION} +TCL_EXE := ${TCLSH_DIR}/tclsh${TCL_VERSION} MAKE_VARS := TCL_EXE export DYLD_FRAMEWORK_PATH := ${TCL_FRAMEWORK_DIR} endif |