Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686
Modified Files: Makefile Log Message: only embed the Tcl/Tk frameworks if not using the built-in one in /System. i.e. only embed the frameworks if building on a machine where other Tcl/Tk Frameworks have been installed
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Makefile 4 Dec 2006 00:36:48 -0000 1.62 --- Makefile 5 Dec 2006 21:52:52 -0000 1.63 *************** *** 102,106 **** "$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \ "$(PD_APP_CONTENTS)/Resources" ! # embed Tcl/Tk Frameworks and remove cruft install -d $(PD_APP_CONTENTS)/Frameworks \ $(PD_APP_CONTENTS)/Frameworks/Tcl.framework \ --- 102,107 ---- "$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \ "$(PD_APP_CONTENTS)/Resources" ! # only embed the Tcl/Tk Frameworks if not building against the built-in ones ! ifneq (/System,$(findstring /System,$(WISH_FRAMEWORKS_SOURCE))) install -d $(PD_APP_CONTENTS)/Frameworks \ $(PD_APP_CONTENTS)/Frameworks/Tcl.framework \ *************** *** 127,130 **** --- 128,132 ---- fix_install_name "$(PD_APP_CONTENTS)/MacOS/$(WISH_NAME)" Tcl && \ fix_install_name "$(PD_APP_CONTENTS)/MacOS/$(WISH_NAME)" Tk + endif # NOT /System # set up app wrapper install -d "$(PD_APP_CONTENTS)/Resources/Scripts"