diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-21 16:04:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-21 16:04:20 (GMT) |
| commit | 60185fa162e07e3ffb2351e26b1946570633487a (patch) | |
| tree | 5604c1f6df6ec3460b9a634d928ccfb58d559bb0 /macosx/GNUmakefile | |
| parent | 4ff12b5ba2d676f45815ea946d632c63c925083d (diff) | |
| parent | 6c408f9635216a7ef5b45abb0084de2b648bd77a (diff) | |
| download | tk-60185fa162e07e3ffb2351e26b1946570633487a.zip tk-60185fa162e07e3ffb2351e26b1946570633487a.tar.gz tk-60185fa162e07e3ffb2351e26b1946570633487a.tar.bz2 | |
Merge trunk
Diffstat (limited to 'macosx/GNUmakefile')
| -rw-r--r-- | macosx/GNUmakefile | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index e753c29..243d33a 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -211,9 +211,15 @@ 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}/Tk.framework" endif +ifeq (${SUBFRAMEWORK},1) + @rm -rf "${INSTALL_ROOT}/Frameworks/Tk.framework" +endif ${DO_MAKE} ifeq (${EMBEDDED_BUILD}_${TK_X11},1_) # workaround bug with 'cp -pRH' on Darwin 6 and earlier @@ -228,8 +234,8 @@ ifeq (${EMBEDDED_BUILD},1) else # install wish symbolic link @ln -fs ${WISH} "${INSTALL_ROOT}${BINDIR}/${wish}" -endif -endif +endif # embedded +endif # install ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) # keep copy of debug library around, so that # Deployment build can be installed on top @@ -237,8 +243,9 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) # the debug library @cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \ ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug" -endif +endif # Development, not embedded ifeq (${TK_X11},) +ifeq (${SUBFRAMEWORK},) ifeq (${EMBEDDED_BUILD},) # install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links @cd "${TOP_DIR}" && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \ @@ -272,9 +279,15 @@ else fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk ifeq (${INSTALL_BUILD},1) @cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true -endif -endif -endif +endif # install +endif # embedded +else +# Clean up the destination directory if this is a subframework + @rm -rf ${INSTALL_ROOT}/Frameworks + @mv "${INSTALL_ROOT}/Library/Frameworks" "${INSTALL_ROOT}" + @rm -rf ${INSTALL_ROOT}/Library +endif # not subframework +endif # not X11 clean-${PROJECT}: %-${PROJECT}: ${DO_MAKE} |