* win/Makefile.in (install-*): reduced verbosity of install

	* win/tkWinPixmap.c (XGetGeometry): added support for windows in
	XGetGeometry [Bug: 4069]

	* win/tkWinFont.c (GetScreenFont): fixed possible mem overrun with
	long font names [Bug: 4108]

	* win/tkWinDialog.c: added EnableWindow calls to dialogs to
	correct for possible loss of control in parent Tk toplevel
	[Bug: 1212 et al]

1 files changed, 14 insertions, 19 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index f315df1..f0f412b 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.16 1999/12/13 23:22:07 wart Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.17 2000/02/01 11:41:43 hobbs Exp $
 
 TCLVERSION = @TCL_VERSION@
 VERSION = @TK_VERSION@
@@ -381,7 +381,6 @@ install: all install-binaries install-libraries install-doc install-demos
 install-binaries:
 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
 	    do \
-	    echo "	$$i"; \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
 		$(MKDIR) $$i; \
@@ -389,31 +388,29 @@ install-binaries:
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing $(TK_LIB_FILE)"
+	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
 	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-	@echo "Installing $(WISH)"
+	@echo "Installing $(WISH) as $(BIN_INSTALL_DIR)/wish$(VERSION)"
 	@$(INSTALL_PROGRAM) $(WISH) $(BIN_INSTALL_DIR)/$(WISH)
+	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
+	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 	@if test "$(DLLSUFFIX)" != "" ; then \
-		echo "Installing $(TK_DLL_FILE)" ; \
-		$(INSTALL_PROGRAM) $(TK_DLL_FILE) \
-			$(BIN_INSTALL_DIR)/$(TK_DLL_FILE) ; \
+	    echo "Installing $(TK_DLL_FILE) to $(LIB_INSTALL_DIR)/" ; \
+	    $(INSTALL_PROGRAM) $(TK_DLL_FILE) \
+		$(BIN_INSTALL_DIR)/$(TK_DLL_FILE) ; \
 	fi
 	@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
 	    if [ -f $(TK_STUB_LIB_FILE) ]; then \
-	        echo "Installing $(TK_STUB_LIB_FILE)"; \
+	        echo "Installing $(TK_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
 	        $(INSTALL_DATA) $(TK_STUB_LIB_FILE) \
 			 $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
 	    fi; \
         fi
-	echo "Installing tkConfig.sh"
-	$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 
 install-libraries:
-	@echo "Install Directories:"
 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
 	    do \
-	    echo "	$$i"; \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
 		$(MKDIR) $$i; \
@@ -421,32 +418,30 @@ install-libraries:
 		else true; \
 		fi; \
 	    done;
+	@echo "Installing header files";
 	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 	    do \
-	    echo "Installing $$i"; \
 	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 	    done;
+	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
 	@for i in $(ROOT_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
 	        $(ROOT_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
 	    do \
-	    echo "Installing $$i"; \
 	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
 	    done;
+	@echo "Installing library images directory";
 	@for i in $(ROOT_DIR)/library/images/*; \
 	    do \
 	    if [ -f $$i ] ; then \
-		echo "Installing $$i"; \
 		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/images; \
 	    fi; \
 	    done;
 
 install-demos:
-	@echo "Install Directories:"
 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
 		$(SCRIPT_INSTALL_DIR)/demos \
 		$(SCRIPT_INSTALL_DIR)/demos/images ; \
 	    do \
-	    echo "	$$i"; \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
 		$(MKDIR) $$i; \
@@ -454,10 +449,10 @@ install-demos:
 		else true; \
 		fi; \
 	    done;
+	@echo "Installing demos to $(SCRIPT_INSTALL_DIR)/demos/";
 	@for i in $(ROOT_DIR)/library/demos/*; \
 	    do \
 	    if [ -f $$i ] ; then \
-		echo "Installing $$i"; \
 		sed -e '3 s|exec $(WISH)|exec $(WISH)|' \
 			$$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
 	    fi; \
@@ -466,10 +461,10 @@ install-demos:
 	    do \
 	    chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
 	    done;
+	@echo "Installing demo images";
 	@for i in $(ROOT_DIR)/library/demos/images/*; \
 	    do \
 	    if [ -f $$i ] ; then \
-		echo "Installing $$i"; \
 		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
 		fi; \
 	    done;