summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-02-09 09:48:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-02-09 09:48:23 (GMT)
commit8f151700b10bf8811876305e284738707d4ad237 (patch)
tree7348f0504cc492c7167eda1dfe3c77faf4f56185
parent199e45b764bee51a9aacbced3e5ac9828b731d3f (diff)
downloadtk-8f151700b10bf8811876305e284738707d4ad237.zip
tk-8f151700b10bf8811876305e284738707d4ad237.tar.gz
tk-8f151700b10bf8811876305e284738707d4ad237.tar.bz2
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/GNUmakefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 24e1f77..d0bab1a 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