diff options
| author | das <das> | 2005-06-03 08:52:35 (GMT) |
|---|---|---|
| committer | das <das> | 2005-06-03 08:52:35 (GMT) |
| commit | 4b070c479d73498774dd20d8c7723b9cee72133b (patch) | |
| tree | bdec862e5d208015cbd5f43b4676a9c72afc6387 | |
| parent | 5ed930b5fa9ee7132f552bf0fa5965a7a5b3b548 (diff) | |
| download | tk-4b070c479d73498774dd20d8c7723b9cee72133b.zip tk-4b070c479d73498774dd20d8c7723b9cee72133b.tar.gz tk-4b070c479d73498774dd20d8c7723b9cee72133b.tar.bz2 | |
* macosx/Makefile: fixed 'embedded' target.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | macosx/Makefile | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2005-06-03 Daniel Steffen <das@users.sourceforge.net> + + * macosx/Makefile: fixed 'embedded' target. + 2005-06-02 Reinhard Max <max@suse.de> * unix/tkUnix.c (Tk_GetUserInactiveTime): Improvements to get it diff --git a/macosx/Makefile b/macosx/Makefile index a1cd172..283af72 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.17 2005/05/26 11:19:01 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.18 2005/06/03 08:52:35 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 -C \ |