diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-12-05 21:52:52 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-12-05 21:52:52 +0000 |
| commit | b2c17a15595d9f99dafc38fd7cc6165b7888157c (patch) | |
| tree | 0904311c300caf7dcd7b20936274c9fed49bc60b /packages | |
| parent | e8336255d1aedaf7d0094de6023d5ed4339107e9 (diff) | |
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
svn path=/trunk/; revision=6650
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/darwin_app/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index 45584ebd..e749aeb0 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -101,7 +101,8 @@ darwin_app_wrapper: Info.plist install -m0644 -p \ "$(WISH_CONTENTS)/Resources/$(WISH_NAME).rsrc" \ "$(PD_APP_CONTENTS)/Resources" -# embed Tcl/Tk Frameworks and remove cruft +# 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 \ $(PD_APP_CONTENTS)/Frameworks/Tk.framework @@ -126,6 +127,7 @@ darwin_app_wrapper: Info.plist 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 +endif # NOT /System # set up app wrapper install -d "$(PD_APP_CONTENTS)/Resources/Scripts" install -m0644 -p Info.plist "$(PD_APP_CONTENTS)" |