From fe60a6accd37f060bfc96a6248560c66f2da9f1f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 28 Nov 2006 06:34:36 +0000 Subject: another attempt to make the Tcl/Tk Frameworks embed properly svn path=/trunk/; revision=6480 --- packages/darwin_app/Makefile | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'packages') diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index a1079a7a..6fce0fee 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -101,27 +101,16 @@ darwin_app_wrapper: Info.plist install -m0644 -p \ "$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \ "$(PD_APP_CONTENTS)/Resources" -# Tcl - install -d $(PD_APP_CONTENTS)/Frameworks - install -d $(PD_APP_CONTENTS)/Frameworks/Tcl.framework - install -p $(WISH_FRAMEWORKS_SOURCE)/Tcl.framework/Versions/Current/Tcl \ +# embed Tcl/Tk Frameworks and remove cruft + install -d $(PD_APP_CONTENTS)/Frameworks \ + $(PD_APP_CONTENTS)/Frameworks/Tcl.framework \ + $(PD_APP_CONTENTS)/Frameworks/Tk.framework + ditto $(WISH_FRAMEWORKS_SOURCE)/Tcl.framework \ $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/ - install -d $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/Resources - install -p $(WISH_FRAMEWORKS_SOURCE)/Tcl.framework/Resources/Info.plist \ - $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/Resources/ - ditto $(WISH_FRAMEWORKS_SOURCE)/Tcl.framework/Resources/Scripts \ - $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/Resources/ -# Tk - install -d $(PD_APP_CONTENTS)/Frameworks - install -d $(PD_APP_CONTENTS)/Frameworks/Tk.framework - install -p $(WISH_FRAMEWORKS_SOURCE)/Tk.framework/Versions/Current/Tk \ + ditto $(WISH_FRAMEWORKS_SOURCE)/Tk.framework \ $(PD_APP_CONTENTS)/Frameworks/Tk.framework/ - install -d $(PD_APP_CONTENTS)/Frameworks/Tk.framework/Resources - install -p $(WISH_FRAMEWORKS_SOURCE)/Tk.framework/Resources/Info.plist \ - $(WISH_FRAMEWORKS_SOURCE)/Tk.framework/Resources/Tk.rsrc \ - $(PD_APP_CONTENTS)/Frameworks/Tk.framework/Resources/ - ditto $(WISH_FRAMEWORKS_SOURCE)/Tk.framework/Resources/Scripts \ - $(PD_APP_CONTENTS)/Frameworks/Tk.framework/Resources/ + rm -rf $(PD_APP_CONTENTS)/Frameworks/Tcl.framework/{,/Versions/8.4}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ + rm -rf $(PD_APP_CONTENTS)/Frameworks/Tk.framework/{,/Versions/8.4}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} # from http://tktoolkit.cvs.sourceforge.net/tktoolkit/tk/macosx/GNUmakefile fix_install_id ( ) { \ chmod -R a+w "$$1"; \ -- cgit v1.2.1