summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-06-17 20:17:54 (GMT)
committerhobbs <hobbs>2002-06-17 20:17:54 (GMT)
commitf661c8d8f05bc45cb77c196f3b89e5fc90d00500 (patch)
treee66006cf75fa79ecc22e5db9a87cad0a7ba97a2f
parentcb5b0eee045db6a7562a5d39b8ee215f85eff48f (diff)
downloadtk-f661c8d8f05bc45cb77c196f3b89e5fc90d00500.zip
tk-f661c8d8f05bc45cb77c196f3b89e5fc90d00500.tar.gz
tk-f661c8d8f05bc45cb77c196f3b89e5fc90d00500.tar.bz2
* unix/Makefile.in (dist): correct installation of
wish.exe.manifest to DISTDIR target directory.
-rw-r--r--ChangeLog3
-rw-r--r--unix/Makefile.in4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e68d8f..424e0d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2002-06-17 Jeff Hobbs <jeffh@ActiveState.com>
+ * unix/Makefile.in (dist): correct installation of
+ wish.exe.manifest to DISTDIR target directory.
+
* generic/tkCmds.c (Tk_TkObjCmd):
* generic/tkInt.h (struct TkCaret):
* mac/tkMacXStubs.c (Tk_SetCaretPos):
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 50ec2cf..5704ebe 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.67 2002/06/14 23:10:42 jenglish Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.68 2002/06/17 20:17:55 hobbs Exp $
# Current Tk version; used in various names.
@@ -1074,7 +1074,7 @@ dist: $(UNIX_DIR)/configure
cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
mkdir $(DISTDIR)/win/rc
- cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(TOP_DIR)/win/rc/
+ cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(DISTDIR)/win/rc/
cp -p $(TOP_DIR)/win/rc/*.rc $(TOP_DIR)/win/rc/*.cur \
$(TOP_DIR)/win/rc/*.ico $(TOP_DIR)/win/rc/*.bmp \
$(DISTDIR)/win/rc