summaryrefslogtreecommitdiffstats
path: root/macosx/Makefile
diff options
context:
space:
mode:
authordas <das>2005-05-26 11:19:25 (GMT)
committerdas <das>2005-05-26 11:19:25 (GMT)
commit57ee6386d1f294a81696dd756f6650c50201d918 (patch)
tree09881d76e37d3e83cb0790daebb2de73e921e1e2 /macosx/Makefile
parenta4cdc865d7714654fd17a2e9ebb03a26826daecc (diff)
downloadtcl-57ee6386d1f294a81696dd756f6650c50201d918.zip
tcl-57ee6386d1f294a81696dd756f6650c50201d918.tar.gz
tcl-57ee6386d1f294a81696dd756f6650c50201d918.tar.bz2
* macosx/Makefile: moved & corrected EMBEDDED_BUILD check.
* unix/configure.in: corrected framework finalization to softlink stub library to Versions/8.x subdir instead of Versions/Current. * unix/configure: autoconf-2.59
Diffstat (limited to 'macosx/Makefile')
-rw-r--r--macosx/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/macosx/Makefile b/macosx/Makefile
index 7883d12..fe59e7b 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -4,7 +4,7 @@
# uses the standard unix build system in tcl/unix (which can be used directly instead of this
# if you are not using the tk/macosx projects).
#
-# RCS: @(#) $Id: Makefile,v 1.5.2.11 2005/05/24 04:20:08 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.5.2.12 2005/05/26 11:19:32 das Exp $
#
########################################################################################################
@@ -129,11 +129,6 @@ ${OBJ_DIR}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure
${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}
build-${PROJECT}: ${OBJ_DIR}/Makefile
-ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
- @echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
-else
- @rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tcl.framework"
-endif
${DO_MAKE}
# symolic link hackery to trick
# 'make install INSTALL_ROOT=${OBJ_DIR}'
@@ -143,6 +138,12 @@ endif
ln -fs ${SYMROOT} ./${BINDIR} && ln -fs ${OBJ_DIR}/tcltest ${SYMROOT}
install-${PROJECT}: build-${PROJECT}
+ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
+ @echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
+endif
+ifeq (${EMBEDDED_BUILD},1)
+ @rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tcl.framework"
+endif
${DO_MAKE}
ifeq (${INSTALL_BUILD},1)
ifeq (${EMBEDDED_BUILD},1)