diff options
| author | das <das> | 2005-06-18 21:46:02 (GMT) |
|---|---|---|
| committer | das <das> | 2005-06-18 21:46:02 (GMT) |
| commit | 1b6b31dc57b749dc2f61165e4389744699ada83d (patch) | |
| tree | 424c86b8e56b4fc88b3f373760c4357fe320b60d /macosx | |
| parent | 269c0f37fabe9229c395ebdac5ec826438d103ec (diff) | |
| download | tk-1b6b31dc57b749dc2f61165e4389744699ada83d.zip tk-1b6b31dc57b749dc2f61165e4389744699ada83d.tar.gz tk-1b6b31dc57b749dc2f61165e4389744699ada83d.tar.bz2 | |
* macosx/Makefile: for X11 build, add -X11 suffix to unversioned wish
symbolic link.
* unix/tcl.m4 (Darwin): add -headerpad_max_install_names to LDFLAGS to
ensure we can always relocate binaries with install_name_tool.
* unix/configure: autoconf-2.59
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 283af72..42e635c 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -4,7 +4,7 @@ # uses the standard unix build system in tk/unix (which can be used directly instead of this # if you are not using the tk/macosx projects). # -# RCS: @(#) $Id: Makefile,v 1.18 2005/06/03 08:52:35 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.19 2005/06/18 21:46:02 das Exp $ # ######################################################################################################## @@ -97,6 +97,7 @@ PRODUCT_NAME := Tk UNIX_DIR := ${CURDIR}/../unix VERSION := $(shell awk -F= '/^TK_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.in) TCL_VERSION := ${VERSION} +wish := wish WISH = wish${VERSION} BUILD_TARGET := wish @@ -117,6 +118,7 @@ ifeq (${TK_X11},) override CONFIGURE_ARGS := ${CONFIGURE_ARGS} --enable-aqua else VERSION := ${VERSION}-X11 +wish := ${wish}-X11 endif INSTALL_TARGETS = install-binaries install-libraries @@ -216,7 +218,7 @@ else if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi; \ if [ -n "$${RM_TCL:-}" ]; then rm -f ./${LIBDIR}/Tcl.framework; fi # install wish symbolic link - @ln -fs ${WISH} ${INSTALL_ROOT}${BINDIR}/wish + @ln -fs ${WISH} ${INSTALL_ROOT}${BINDIR}/${wish} endif endif ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) |