summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das@noemail.net>2005-06-03 08:52:12 (GMT)
committerdas <das@noemail.net>2005-06-03 08:52:12 (GMT)
commitc30e17d81d8a971c53ac0636481347e2fd62c42d (patch)
tree311d6d81353aa8a279e2e493e05990bdda9c3d2d
parent979857159446756d3a5dacff395ad83eb1ce641b (diff)
downloadtcl-c30e17d81d8a971c53ac0636481347e2fd62c42d.zip
tcl-c30e17d81d8a971c53ac0636481347e2fd62c42d.tar.gz
tcl-c30e17d81d8a971c53ac0636481347e2fd62c42d.tar.bz2
* macosx/Makefile: fixed 'embedded' target.
FossilOrigin-Name: ed94bc6122b5ce8cdbff16377bec33bffac6fd0b
-rw-r--r--ChangeLog4
-rw-r--r--macosx/Makefile7
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ca24a7..c4cb103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-03 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/Makefile: fixed 'embedded' target.
+
2005-06-02 Jeff Hobbs <jeffh@ActiveState.com>
* unix/Makefile.in (html): add BUILD_HTML_FLAGS optional var
diff --git a/macosx/Makefile b/macosx/Makefile
index 3d30e66..7195e77 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.21 2005/05/26 11:18:20 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.22 2005/06/03 08:52:16 das Exp $
#
########################################################################################################
@@ -116,12 +116,11 @@ 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}/
-
#-------------------------------------------------------------------------------------------------------
# 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 -C \