* win/Makefile.in: Don't define TCL_DBGX

	symbol for every compile. Instead, define
	TCL_PIPE_DLL only when compiling tclWinPipe.c.
	This will break other build systems, so
	they will need to remove the TCL_DBGX define
	and replace it with a define for TCL_PIPE_DLL.
	* win/tclWinPipe.c (TclpCreateProcess):
	Remove PREFIX_IDENT and DEBUG_IDENT from
	top of file. Use TCL_PIPE_DLL passed in
	from build env instead of trying to construct
	the dll name from already defined symbols.
	This approach is more flexible and better
	in the long run.

3 files changed, 31 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 34cfeb4..201b5fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2003-04-14  Mo DeJong  <mdejong@users.sourceforge.net>
+
+	* win/Makefile.in: Don't define TCL_DBGX
+	symbol for every compile. Instead, define
+	TCL_PIPE_DLL only when compiling tclWinPipe.c.
+	This will break other build systems, so
+	they will need to remove the TCL_DBGX define
+	and replace it with a define for TCL_PIPE_DLL.
+	* win/tclWinPipe.c (TclpCreateProcess):
+	Remove PREFIX_IDENT and DEBUG_IDENT from
+	top of file. Use TCL_PIPE_DLL passed in
+	from build env instead of trying to construct
+	the dll name from already defined symbols.
+	This approach is more flexible and better
+	in the long run.
+
 2003-04-14  Kevin Kenny  <kennykb@acm.org>
 
 	* win/tclWinFile.c: added conditionals to restore compilation on
diff --git a/win/Makefile.in b/win/Makefile.in
index 75150aa..a008ab1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.70 2003/04/12 19:51:24 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.71 2003/04/15 00:18:58 mdejong Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -85,7 +85,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@
 
 # To enable compilation debugging reverse the comment characters on
 # one of the following lines.
@@ -115,6 +115,13 @@ DLLSUFFIX		= @DLLSUFFIX@
 LIBSUFFIX		= @LIBSUFFIX@
 EXESUFFIX		= @EXESUFFIX@
 
+VER			= @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@
+DOTVER			= @TCL_MAJOR_VERSION@.@TCL_MINOR_VERSION@
+DDEVER			= @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@
+DDEDOTVER		= @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@
+REGVER			= @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@
+REGDOTVER		= @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@
+
 TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
 TCL_LIB_FILE		= @TCL_LIB_FILE@
@@ -167,12 +174,6 @@ SHLIB_LD	= @SHLIB_LD@
 SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ $(LIBS)
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_SUFFIX	= @SHLIB_SUFFIX@
-VER		= @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@
-DOTVER		= @TCL_MAJOR_VERSION@.@TCL_MINOR_VERSION@
-DDEVER		= @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@
-DDEDOTVER	= @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@
-REGVER		= @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@
-REGDOTVER	= @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@
 LIBS		= @LIBS@
 
 RMDIR		= rm -rf
@@ -385,6 +386,10 @@ ${PIPE_DLL_FILE}: ${PIPE_OBJS}
 tclWinInit.${OBJEXT}: tclWinInit.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
+tclWinPipe.${OBJEXT}: tclWinPipe.c
+	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_PIPE_DLL=\"$(PIPE_DLL_FILE)\" \
+	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
+
 testMain.${OBJEXT}: tclAppInit.c
 	$(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME)
 
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 4c8bc47..48931aa 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -9,12 +9,9 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinPipe.c,v 1.34 2003/03/12 19:21:26 dgp Exp $
+ * RCS: @(#) $Id: tclWinPipe.c,v 1.35 2003/04/15 00:18:58 mdejong Exp $
  */
 
-#define PREFIX_IDENT ""
-#define DEBUG_IDENT TCL_DBGX
-
 #include "tclWinInt.h"
 
 #include <fcntl.h>
@@ -1211,9 +1208,7 @@ TclpCreateProcess(
 		char *start,*end;
 		Tcl_DString pipeDll;
 		Tcl_DStringInit(&pipeDll);
-		Tcl_DStringAppend(&pipeDll, PREFIX_IDENT "tclpip"
-		    STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION)
-		    STRINGIFY(DEBUG_IDENT) ".dll ", -1);
+		Tcl_DStringAppend(&pipeDll, TCL_PIPE_DLL, -1);
 		tclExePtr = Tcl_NewStringObj(TclpFindExecutable(""), -1);
 		start = Tcl_GetStringFromObj(tclExePtr, &i);
 		for (end = start + (i-1); end > start; end--) {