diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-16 21:06:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-16 21:06:16 (GMT) |
| commit | 1af02b624978cb251fa9e93878c8e6575e09b5da (patch) | |
| tree | ea051233fd73240756a7f619098369c4bd509244 /macosx/GNUmakefile | |
| parent | c4c42ab47ea735e7c79416a00708adcaacdcc7b2 (diff) | |
| parent | 0b2a192339817f77ae34af6114b41251819894ff (diff) | |
| download | tk-1af02b624978cb251fa9e93878c8e6575e09b5da.zip tk-1af02b624978cb251fa9e93878c8e6575e09b5da.tar.gz tk-1af02b624978cb251fa9e93878c8e6575e09b5da.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx/GNUmakefile')
| -rw-r--r-- | macosx/GNUmakefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 2263e37..e753c29 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -25,6 +25,7 @@ EXTRA_CONFIGURE_ARGS ?= EXTRA_MAKE_ARGS ?= INSTALL_PATH ?= /Library/Frameworks +TCL_INSTALL_PATH ?= ${INSTALL_PATH}/Tcl.framework APPLICATION_INSTALL_PATH ?= /Applications/Utilities PREFIX ?= /usr/local BINDIR ?= ${PREFIX}/bin @@ -107,7 +108,7 @@ TCL_VERSION := ${VERSION} wish := wish WISH = wish${VERSION} -BUILD_TARGET := all tktest +BUILD_TARGET := binaries libraries tktest INSTALL_TARGET := install ifneq ($(wildcard $(subst ${space},\ ,${TCL_BUILD_DIR})/tclConfig.sh),) @@ -115,7 +116,7 @@ TCL_DIR := ${TCL_BUILD_DIR} TCL_FRAMEWORK_DIR := ${TCL_BUILD_DIR}/.. MAKE_VARS := else -TCL_DIR := ${TCL_FRAMEWORK_DIR}/Tcl.framework +TCL_DIR := ${TCL_INSTALL_PATH} TCL_EXE := ${TCLSH_DIR}/tclsh${TCL_VERSION} MAKE_VARS := TCL_EXE export DYLD_FRAMEWORK_PATH := ${TCL_FRAMEWORK_DIR} |