summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorculler <culler>2020-10-21 18:02:31 (GMT)
committerculler <culler>2020-10-21 18:02:31 (GMT)
commitfb10e693b2a8b1d3c30b2de7c9899f0d7a7081a9 (patch)
tree28089df61e1ff128a2c732fc43f72f05d88c168f /macosx
parentfd9662ee1c86d86ba0a92a616b5821fd389551e1 (diff)
downloadtcl-fb10e693b2a8b1d3c30b2de7c9899f0d7a7081a9.zip
tcl-fb10e693b2a8b1d3c30b2de7c9899f0d7a7081a9.tar.gz
tcl-fb10e693b2a8b1d3c30b2de7c9899f0d7a7081a9.tar.bz2
When building a subframework for macOS use a build directory in the staging directory.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/GNUmakefile15
-rw-r--r--macosx/README7
2 files changed, 15 insertions, 7 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index e55b661..cdeb099 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 cb36811..c2bcc42 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/