Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3716
Modified Files: Makefile Log Message: fixed building with older Tcl/Tk Frameworks, like the included Apple versions
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Makefile 28 Nov 2006 06:34:36 -0000 1.60 --- Makefile 30 Nov 2006 04:22:05 -0000 1.61 *************** *** 15,19 **** include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
! WISH_FRAMEWORKS_SOURCE := $(shell (test -e "/Library/Frameworks/Tk.framework/Tk" && echo "/Library/Frameworks") || /System/Library/Frameworks) WISH_SOURCE = $(WISH_FRAMEWORKS_SOURCE)/Tk.framework/Resources # Wish Shell.app changed to Wish.app in TclTk 8.4.10 --- 15,19 ---- include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
! WISH_FRAMEWORKS_SOURCE := $(shell (test -e "/Library/Frameworks/Tk.framework/Tk" && echo "/Library/Frameworks") || echo /System/Library/Frameworks) WISH_SOURCE = $(WISH_FRAMEWORKS_SOURCE)/Tk.framework/Resources # Wish Shell.app changed to Wish.app in TclTk 8.4.10 *************** *** 125,130 **** fix_install_id $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/Tcl Tcl && \ fix_install_id $(PD_APP_CONTENTS)/Frameworks/Tk.framework/Tk Tk && \ ! fix_install_name $(PD_APP_CONTENTS)/MacOS/Wish Tcl && \ ! fix_install_name $(PD_APP_CONTENTS)/MacOS/Wish Tk # set up app wrapper install -d "$(PD_APP_CONTENTS)/Resources/Scripts" --- 125,130 ---- fix_install_id $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/Tcl Tcl && \ fix_install_id $(PD_APP_CONTENTS)/Frameworks/Tk.framework/Tk Tk && \ ! fix_install_name "$(PD_APP_CONTENTS)/MacOS/$(WISH_NAME)" Tcl && \ ! fix_install_name "$(PD_APP_CONTENTS)/MacOS/$(WISH_NAME)" Tk # set up app wrapper install -d "$(PD_APP_CONTENTS)/Resources/Scripts"