From 3c48072c41bc2d591e55ddc9f182cf3a93c5c24c Mon Sep 17 00:00:00 2001 From: hobbs Date: Thu, 8 Dec 2005 21:13:16 +0000 Subject: fix dist target for manifest dir change --- ChangeLog | 1 + unix/Makefile.in | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88a0689..91d0314 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * win/configure.in: Add CE build support (some C code fixes needed) * win/wish.exe.manifest.in (new): manifest must map in MACHINE * win/rc/wish.exe.manifest (removed): and VERSION to be correct. + * unix/Makefile.in: fix dist target for manifest dir change * generic/tkTextTag.c (TkTextTagCmd): use correct arraySize for peered text widgets in [$text tag names]. [Bug 1375069 1374935] diff --git a/unix/Makefile.in b/unix/Makefile.in index a14cfdb..5d6c2f1 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.109 2005/11/27 02:36:15 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.110 2005/12/08 21:13:17 hobbs Exp $ # Current Tk version; used in various names. @@ -1376,12 +1376,12 @@ 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 $(DISTDIR)/win/rc/ + cp -p $(TOP_DIR)/win/wish.exe.manifest.in $(DISTDIR)/win/ 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 $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc - $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest + $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/wish.exe.manifest.in mkdir $(DISTDIR)/macosx cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \ $(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.c \ -- cgit v0.12