diff options
| author | das <das@noemail.net> | 2005-06-18 21:47:45 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2005-06-18 21:47:45 (GMT) |
| commit | d218e09cd64e6f919a7c70e522eb9eb24f8169eb (patch) | |
| tree | 7d470171c0fcaac32a30282aef96a9b4e69d3d2d /macosx/Makefile | |
| parent | 91c148885315a69a068362830e8a74a376caed9e (diff) | |
| download | tk-d218e09cd64e6f919a7c70e522eb9eb24f8169eb.zip tk-d218e09cd64e6f919a7c70e522eb9eb24f8169eb.tar.gz tk-d218e09cd64e6f919a7c70e522eb9eb24f8169eb.tar.bz2 | |
*** 8.4.11 TAGGED FOR RELEASE ***
* 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.13
FossilOrigin-Name: b83477967fc167941ff4d5c90b126dd0347e648b
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index b46aee2..e611787 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.7.2.10 2005/06/03 08:54:12 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7.2.11 2005/06/18 21:47:47 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_) |