summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-06-03 08:54:12 (GMT)
committerdas <das>2005-06-03 08:54:12 (GMT)
commit8757a38d1d6d8b15d66c7e68eb1b302d7102e10d (patch)
treedd013e04f98b87e0a7d3ff33cad3d0a398c95eac
parent088e54fa55803c3b99d6482e61083a64aec4df87 (diff)
downloadtk-8757a38d1d6d8b15d66c7e68eb1b302d7102e10d.zip
tk-8757a38d1d6d8b15d66c7e68eb1b302d7102e10d.tar.gz
tk-8757a38d1d6d8b15d66c7e68eb1b302d7102e10d.tar.bz2
* macosx/Makefile: fixed 'embedded' target.core_8_4_10
-rw-r--r--ChangeLog6
-rw-r--r--macosx/Makefile7
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bc29692..e78a5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-2005-06-02 Jim Ingham <jingham@apple.com>
+2005-06-03 Daniel Steffen <das@users.sourceforge.net>
*** 8.4.10 TAGGED FOR RELEASE ***
+ * macosx/Makefile: fixed 'embedded' target.
+
+2005-06-02 Jim Ingham <jingham@apple.com>
+
Another patch from M. Kirkham.
* macosx/tkMacOSXScrlbr.c (ThumbActionProc, ScrollBarBindProc):
diff --git a/macosx/Makefile b/macosx/Makefile
index fe0ce92..b46aee2 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.9 2005/05/26 11:20:08 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.7.2.10 2005/06/03 08:54:12 das Exp $
#
########################################################################################################
@@ -140,8 +140,6 @@ clean-${PROJECT} distclean-${PROJECT} test-${PROJECT}: \
DO_MAKE = +${MAKE} -C ${OBJ_DIR} ${target} ${MAKE_ARGS_V} ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
-${PROJECT}: override INSTALL_ROOT := ${OBJ_DIR}/
-
#-------------------------------------------------------------------------------------------------------
# locations for custom tk install actions
@@ -161,7 +159,8 @@ TK_FMWK_DIR := ${FMWK_DIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}
#-------------------------------------------------------------------------------------------------------
# build rules
-${PROJECT}: install-${PROJECT}
+${PROJECT}:
+ ${MAKE} install-${PROJECT} INSTALL_ROOT=${OBJ_DIR}/
${OBJ_DIR}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure
mkdir -p ${OBJ_DIR} && cd ${OBJ_DIR} && ${UNIX_DIR}/configure \