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 /macosx/GNUmakefile | |
parent | 8514e602485031cf491be2482dc2aedf558e7c07 (diff) | |
parent | cac264cd19efaa76a0b0ab5a961401118cc4b432 (diff) | |
download | tcl-6459a50433a6f175cfce01066b1cdb5e1f3e7c8f.zip tcl-6459a50433a6f175cfce01066b1cdb5e1f3e7c8f.tar.gz tcl-6459a50433a6f175cfce01066b1cdb5e1f3e7c8f.tar.bz2 |
Merge 8.6
Diffstat (limited to 'macosx/GNUmakefile')
-rw-r--r-- | macosx/GNUmakefile | 15 |
1 files changed, 12 insertions, 3 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 |