diff options
| author | das <das> | 2006-04-12 00:58:41 (GMT) |
|---|---|---|
| committer | das <das> | 2006-04-12 00:58:41 (GMT) |
| commit | f58cd30985ac9310513d15781b1b3b43b95a99fc (patch) | |
| tree | c0445e18a9c0b91a44ceb4101ef9f9d53a817117 /macosx | |
| parent | 29f17227ad41d506327d16125bd288af8e7d38cd (diff) | |
| download | tk-f58cd30985ac9310513d15781b1b3b43b95a99fc.zip tk-f58cd30985ac9310513d15781b1b3b43b95a99fc.tar.gz tk-f58cd30985ac9310513d15781b1b3b43b95a99fc.tar.bz2 | |
fix to 'embedded' targets & cosmetic fix to 'install' targets
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/GNUmakefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 9740151..123efd4 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -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: GNUmakefile,v 1.3 2006/01/10 05:37:51 das Exp $ +# RCS: @(#) $Id: GNUmakefile,v 1.4 2006/04/12 00:58:41 das Exp $ # ######################################################################################################## @@ -179,6 +179,7 @@ endif build-${PROJECT}: ${OBJ_DIR}/Makefile ${DO_MAKE} +ifeq (${INSTALL_BUILD},) # symolic link hackery to trick # 'make install INSTALL_ROOT=${OBJ_DIR}' # into building Tk.framework and wish in ${SYMROOT} @@ -192,6 +193,7 @@ endif # Create symbolic link to Tcl.framework in ${SYMROOT}if necessary @cd ${SYMROOT} && if [ ! -e Tcl.framework -o -L Tcl.framework ]; then \ rm -f Tcl.framework && ln -s ${TCL_FRAMEWORK_DIR}/Tcl.framework . ; fi +endif install-${PROJECT}: build-${PROJECT} ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_) @@ -248,8 +250,8 @@ else ln -fsh Wish.app "./${APP_DIR}/Wish Shell.app" && \ rm -rf "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ mkdir -p "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ - mv -f "./${FMWK_DIR}"/T{cl,k}.framework "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ - rmdir -p "./${FMWK_DIR}" 2>&- || true && cd "./${APP_DIR}/Wish.app/Contents" && \ + ${CPPROG} -RH "./${FMWK_DIR}"/T{cl,k}.framework "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ + cd "./${APP_DIR}/Wish.app/Contents" && \ rm -rf Frameworks/Tcl.framework/{,/Versions/$(TCL_VERSION)}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ rm -rf Frameworks/Tk.framework/{,/Versions/$(VERSION)}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ fix_install_id ( ) { \ @@ -264,6 +266,9 @@ else } && \ fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \ fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk +ifeq (${INSTALL_BUILD},1) + @cd ${TOP_DIR} && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true +endif endif endif |