From f4e6a60dfb4f87476b5af1da6a0e1b3d9011db51 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 27 Jun 2012 12:49:12 +0000
Subject: fix bug in cygwin's [info nameofexecutable] install dde and registry
 dll for cygwin

---
 unix/Makefile.in     | 28 +++++++++++++++++++++++-----
 unix/configure       |  2 +-
 unix/tcl.m4          |  2 +-
 unix/tclConfig.sh.in |  2 +-
 unix/tclUnixFile.c   |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index aa771cc..04e8629 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -580,7 +580,7 @@ valgrindshell: tclsh
 topDirName:
 	@cd $(TOP_DIR); pwd
 
-# The following target generates the file generic/tclDate.c 
+# The following target generates the file generic/tclDate.c
 # from the yacc grammar found in generic/tclGetDate.y.  This is
 # only run by hand as yacc is not available in all environments.
 # The name of the .c file is different than the name of the .y file
@@ -619,7 +619,7 @@ install-strip:
 # possible (e.g. if installing as root).
 
 install-binaries: binaries
-	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
+	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
@@ -647,10 +647,28 @@ install-binaries: binaries
 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
 	    @INSTALL_STUB_LIB@ ; \
 	fi
+	@if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
+	    for i in dde1.2 reg1.1; do \
+		if [ ! -d $(LIB_INSTALL_DIR)/$$i ] ; then \
+	 	   echo "Making directory $(LIB_INSTALL_DIR)/$$i";\
+	 	   mkdir -p $(LIB_INSTALL_DIR)/$$i;\
+	 	   chmod 755 $(LIB_INSTALL_DIR)/$$i;\
+	 	   else true;\
+		fi;\
+	    done;\
+	    echo "Installing tcldde12.dll";\
+		$(INSTALL_DATA) "$(TOP_DIR)/library/dde/pkgIndex.tcl" "$(LIB_INSTALL_DIR)/dde1.2";\
+	    $(INSTALL_LIBRARY) "$(TOP_DIR)/win/tcldde12.dll" "$(LIB_INSTALL_DIR)/dde1.2";\
+	    chmod 555 "$(LIB_INSTALL_DIR)/dde1.2/tcldde12.dll";\
+	    echo "Installing tclreg11.dll";\
+		$(INSTALL_DATA) "$(TOP_DIR)/library/reg/pkgIndex.tcl" "$(LIB_INSTALL_DIR)/reg1.1";\
+	    $(INSTALL_LIBRARY) "$(TOP_DIR)/win/tclreg11.dll" "$(LIB_INSTALL_DIR)/reg1.1";\
+	    chmod 555 "$(LIB_INSTALL_DIR)/reg1.1/tclreg11.dll";\
+	fi
 	@EXTRA_INSTALL_BINARIES@
 
 install-libraries: libraries
-	@for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
@@ -1443,7 +1461,7 @@ machtml:
 #
 # Targets to build Solaris package of the distribution for the current
 # architecture.  To build stream packages for both sun4 and i86pc
-# architectures: 
+# architectures:
 #
 #   On the sun4 machine, execute the following:
 #     make distclean; ./configure
@@ -1497,7 +1515,7 @@ package-common:
 # Build and install the architecture specific files in the dist directory.
 #
 
-package-binaries: 
+package-binaries:
 	cd $(DISTDIR)/unix/`arch`; \
 	$(MAKE); \
 	$(MAKE) install-binaries prefix=$(DISTDIR)/$(PACKAGE)/$(VERSION) \
diff --git a/unix/configure b/unix/configure
index 3830e1b..8d7cc20 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4452,7 +4452,7 @@ fi
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
         else
             MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
-            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(LIB_FILE))'
+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
         fi
     fi
 
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c86a3f2..ac9b3bf 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2224,7 +2224,7 @@ dnl # preprocessing tests use only CPPFLAGS.
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
         else
             MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
-            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(LIB_FILE))'
+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
         fi
     fi
 
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index e3509df..07a524f 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -1,5 +1,5 @@
 # tclConfig.sh --
-# 
+#
 # This shell script (for sh) is generated automatically by Tcl's
 # configure script.  It will create shell variables for most of
 # the configuration options discovered by the configure script.
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 73237c5..2616eda 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -70,7 +70,7 @@ TclpFindExecutable(argv0)
     }
     tclNativeExecutableName = (char *) ckalloc(length + 1);
     memcpy(tclNativeExecutableName, name, length);
-    buf[length] = '\0';
+    tclNativeExecutableName[length] = '\0';
 #else
     if (argv0 == NULL) {
 	return NULL;
-- 
cgit v0.12