diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-22 10:23:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-22 10:23:31 (GMT) |
| commit | 6459a50433a6f175cfce01066b1cdb5e1f3e7c8f (patch) | |
| tree | d50a629d458dcaa20388bf778f2aadc56c2b676f | |
| parent | 8514e602485031cf491be2482dc2aedf558e7c07 (diff) | |
| parent | cac264cd19efaa76a0b0ab5a961401118cc4b432 (diff) | |
| download | tcl-6459a50433a6f175cfce01066b1cdb5e1f3e7c8f.zip tcl-6459a50433a6f175cfce01066b1cdb5e1f3e7c8f.tar.gz tcl-6459a50433a6f175cfce01066b1cdb5e1f3e7c8f.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | macosx/GNUmakefile | 15 | ||||
| -rw-r--r-- | macosx/README | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 2b817c0..93fd843 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -32,6 +32,18 @@ MANDIR ?= ${PREFIX}/man # set to non-empty value to install manpages in addition to html help: INSTALL_MANPAGES ?= +# Checks and overrides for subframework builds +ifeq (${SUBFRAMEWORK},1) +ifeq (${DYLIB_INSTALL_DIR},) + @echo "Cannot install subframework with empty DYLIB_INSTALL_DIR !" && false +endif +ifeq (${DESTDIR},) + @echo "Cannot install subframework with empty DESTDIR !" && false +endif +override BUILD_DIR = ${DESTDIR}/build +override INSTALL_PATH = /Frameworks +endif + #------------------------------------------------------------------------------------------------------- # meta targets @@ -150,9 +162,6 @@ install-${PROJECT}: build-${PROJECT} ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_) @echo "Cannot install-embedded with empty INSTALL_ROOT !" && false endif -ifeq (${SUBFRAMEWORK}_${DYLIB_INSTALL_DIR},1_) - @echo "Cannot install-subframework with empty DYLIB_INSTALL_DIR !" && false -endif ifeq (${EMBEDDED_BUILD},1) @rm -rf "${INSTALL_ROOT}${LIBDIR}/Tcl.framework" endif diff --git a/macosx/README b/macosx/README index c23e6ce..3035bc8 100644 --- a/macosx/README +++ b/macosx/README @@ -172,7 +172,6 @@ variable to the path which should be the install_name path of the Tcl library, s the DESTDIR variable to the pathname of a staging directory where the framework will be written . For example, running this command in the Tcl source directory: make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcl \ - DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/3.9/Frameworks/Tcl -will produce a Tcl.framework intended for installing as a subframework of the -Python.framework. The framework will be found in /tmp/tcl/Library/Frameworks/ - + DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/X.Y/Frameworks/Tcl.framework +will produce a Tcl.framework intended for installing as a subframework of +Some.framework. The framework will be found in /tmp/tcl/Frameworks/ |