diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-08-16 02:28:49 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-08-16 02:28:49 (GMT) |
| commit | 254c3451452e5650816e1096551bed89fc08b474 (patch) | |
| tree | c744663f8cd75e6ca142627a999c5f6a2cdab2c7 /macosx/GNUmakefile | |
| parent | 9e0604e1bd05fbe44b668ae22a66359d1f472029 (diff) | |
| parent | a5d2737b891f83033089844c847e25da0cb83c3c (diff) | |
| download | tk-254c3451452e5650816e1096551bed89fc08b474.zip tk-254c3451452e5650816e1096551bed89fc08b474.tar.gz tk-254c3451452e5650816e1096551bed89fc08b474.tar.bz2 | |
Merge updates for macOS 10.15 Catalina
Diffstat (limited to 'macosx/GNUmakefile')
| -rw-r--r-- | macosx/GNUmakefile | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 39e5962..2263e37 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -225,22 +225,6 @@ ifeq (${EMBEDDED_BUILD},1) @rm -f "${INSTALL_ROOT}${BINDIR}/${WISH}" && \ rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&- || true else -# redo prebinding (when not building for Mac OS X 10.4 or later only) - @if [ "`echo "$${MACOSX_DEPLOYMENT_TARGET}" | \ - awk -F '10\\.' '{print int($$2)}'`" -lt 4 -a "`echo "$${CFLAGS}" | \ - awk -F '-mmacosx-version-min=10\\.' '{print int($$2)}'`" -lt 4 ]; \ - then cd ${INSTALL_ROOT}/; \ - if [ ! -d usr/lib ]; then mkdir -p usr && ln -fs /usr/lib usr/ && RM_USRLIB=1; fi; \ - if [ -n "${TK_X11}" -a ! -d usr/X11R6 ]; then mkdir -p usr && ln -fs /usr/X11R6 usr/ && RM_USRX11=1; fi; \ - if [ ! -d System ]; then ln -fs /System . && RM_SYSTEM=1; fi; \ - if [ ! -d "./${LIBDIR}/Tcl.framework" ]; then ln -fs "${TCL_FRAMEWORK_DIR}/Tcl.framework" "./${LIBDIR}"; RM_TCL=1; fi; \ - redo_prebinding -r . "./${TK_FMWK_DIR}/${PRODUCT_NAME}"; \ - if [ -z "${TK_X11}" ]; then redo_prebinding -r . "./${TK_FMWK_DIR}/Resources/Wish.app/Contents/MacOS/Wish"; \ - else redo_prebinding -r . "./${BINDIR}/${WISH}"; fi; \ - if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \ - if [ -n "$${RM_USRX11:-}" ]; then rm -f usr/X11R6; rmdir -p usr 2>&-; fi; \ - if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi; \ - if [ -n "$${RM_TCL:-}" ]; then rm -f "./${LIBDIR}/Tcl.framework"; fi; fi # install wish symbolic link @ln -fs ${WISH} "${INSTALL_ROOT}${BINDIR}/${wish}" endif |