1diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile 2index 02240ed..aac1d4c 100644 3--- a/macosx/GNUmakefile 4+++ b/macosx/GNUmakefile 5@@ -133,9 +133,7 @@ override EMBEDDED_BUILD := 6 endif 7 8 INSTALL_TARGETS = install-binaries install-libraries 9-ifeq (${EMBEDDED_BUILD},) 10 INSTALL_TARGETS += install-private-headers install-headers install-demos 11-endif 12 ifeq (${INSTALL_BUILD}_${EMBEDDED_BUILD}_${BUILD_STYLE},1__Deployment) 13 INSTALL_TARGETS += html-tk 14 ifneq (${INSTALL_MANPAGES},) 15@@ -253,43 +251,6 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) 16 @cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \ 17 ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug" 18 endif 19-ifeq (${TK_X11},) 20-ifeq (${EMBEDDED_BUILD},) 21-# install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links 22- @cd "${TOP_DIR}" && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \ 23- ln -fsh "./$$(echo "${APP_DIR}" | sed -e 's#/[^/][^/]*#/..#g')/${FMWK_DIR}/${PRODUCT_NAME}.framework/Resources/Wish.app" "./${APP_DIR}" && \ 24- ln -fsh Wish.app "./${APP_DIR}/Wish Shell.app"; fi && \ 25- ln -fsh Wish.app "./${TK_FMWK_DIR}/Resources/Wish Shell.app" && \ 26- ln -fsh Wish "./${TK_FMWK_DIR}/Resources/Wish.app/Contents/MacOS/Wish Shell" 27-else 28-# if we are embedding frameworks, move them into the app and fix their install names 29- @cd "${TOP_DIR}" && \ 30- rm -rf "./${APP_DIR}/Wish.app" && mkdir -p "./${APP_DIR}" && \ 31- mv -f "./${TK_FMWK_DIR}/Resources/Wish.app" "./${APP_DIR}" && \ 32- ln -fsh Wish.app "./${APP_DIR}/Wish Shell.app" && \ 33- rm -rf "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ 34- mkdir -p "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ 35- ${CPPROG} -RH "./${FMWK_DIR}"/T{cl,k}.framework "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ 36- cd "./${APP_DIR}/Wish.app/Contents" && \ 37- rm -rf Frameworks/Tcl.framework/{,/Versions/${TCL_VERSION}}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ 38- rm -rf Frameworks/Tk.framework/{,/Versions/${VERSION}}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ 39- fix_install_id ( ) { \ 40- chmod -RH a+w "$$1"; \ 41- install_name_tool -id $$(otool -L "$$1" | awk "/$$2\.framework.*[^:]\$$/ {sub(\"^.*/Frameworks\",\"@executable_path/../Frameworks\",\$$1); print \$$1}") "$$1"; \ 42- chmod -RH a-w "$$1"; \ 43- } && \ 44- fix_install_name ( ) { \ 45- chmod -RH a+w "$$1"; \ 46- install_name_tool -change $$(otool -L "$$1" | awk "/$$2\.framework.*[^:]\$$/ {print \$$1; sub(\"^.*/Frameworks\",\"@executable_path/../Frameworks\",\$$1); print \$$1}") "$$1"; \ 47- chmod -RH a-w "$$1"; \ 48- } && \ 49- fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \ 50- fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk 51-ifeq (${INSTALL_BUILD},1) 52- @cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true 53-endif 54-endif 55-endif 56 57 clean-${PROJECT}: %-${PROJECT}: 58 ${DO_MAKE} 59