diff options
| author | das <das> | 2009-08-24 00:57:20 (GMT) |
|---|---|---|
| committer | das <das> | 2009-08-24 00:57:20 (GMT) |
| commit | 597cf4ef7ed4e8643efc8c57708e25fdc558a7fc (patch) | |
| tree | 9ca9102b51497232628f90a3372db321a6f6816a /unix | |
| parent | 28787944f9f2ad8e4c2cdc29106f88114026fd29 (diff) | |
| download | tk-597cf4ef7ed4e8643efc8c57708e25fdc558a7fc.zip tk-597cf4ef7ed4e8643efc8c57708e25fdc558a7fc.tar.gz tk-597cf4ef7ed4e8643efc8c57708e25fdc558a7fc.tar.bz2 | |
* macosx/Wish.sdef (new file): Install and enable sdef file
* macosx/Wish-Info.plist.in: into Wish application bundle,
* macosx/Tk.xcode/project.pbxproj: describing TkAqua apple event
* macosx/Tk.xcodeproj/project.pbxproj: support for use by AppleScript.
* unix/Makefile.in: (replaces functionality of
* unix/configure.in: 'aete' resource removed with
Cocoa port & fixes AppleScript
issues reported on tcl-mac)
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rw-r--r-- | unix/configure.in | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 2535943..ab12e68 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.155 2009/07/18 08:16:09 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.156 2009/08/24 00:57:20 das Exp $ # Current Tk version; used in various names. @@ -1577,7 +1577,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M $(TOP_DIR)/macosx/*.icns $(TOP_DIR)/macosx/*.tiff \ $(TOP_DIR)/macosx/*.[ch] $(TOP_DIR)/macosx/*.in \ $(TOP_DIR)/macosx/*.ac $(TOP_DIR)/macosx/*.xcconfig \ - $(TOP_DIR)/macosx/configure $(DISTDIR)/macosx + $(TOP_DIR)/macosx/*.sdef $(TOP_DIR)/macosx/configure \ + $(DISTDIR)/macosx cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx mkdir $(DISTDIR)/macosx/Tk.xcode cp -p $(TOP_DIR)/macosx/Tk.xcode/project.pbxproj \ diff --git a/unix/configure.in b/unix/configure.in index 8891fa5..2d41391 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.167 2009/07/14 08:23:46 dkf Exp $ +# RCS: @(#) $Id: configure.in,v 1.168 2009/08/24 00:57:20 das Exp $ AC_INIT([tk],[8.6]) AC_PREREQ(2.59) @@ -698,6 +698,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && mkdir -p "$(BIN_INSTALL_DIR)/../Resources"' if test $tk_aqua = yes; then EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"' + EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"' else EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.icns" "$(BIN_INSTALL_DIR)/../Resources" && echo "Installing ${WISH_RSRC_FILE} to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "${WISH_RSRC_FILE}" "$(BIN_INSTALL_DIR)/../Resources"' fi |