From 7f8d917032c5618327a7308cfc1374999fb1dab3 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Sat, 1 Mar 2003 01:22:46 +0000
Subject: 	* win/configure: 	* win/configure.in: check for 'g' for
 debug build type, not 'd'. 	* win/rules.vc (DBGX): correct to use 'g' for
 nmake win makefile 	to match the cygwin makefile for debug builds. [Bug
 #635107]

---
 ChangeLog        | 7 +++++++
 win/configure    | 4 ++--
 win/configure.in | 6 +++---
 win/rules.vc     | 8 ++++----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 627dda9..6d847b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-28  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* win/configure:
+	* win/configure.in: check for 'g' for debug build type, not 'd'.
+	* win/rules.vc (DBGX): correct to use 'g' for nmake win makefile
+	to match the cygwin makefile for debug builds. [Bug #635107]
+
 2003-02-28  Vince Darley  <vincentdarley@users.sourceforge.net>
 
 	* doc/file.n: subcommand is 'file volumes' not 'file volume'
diff --git a/win/configure b/win/configure
index ba4a001..775dc4c 100755
--- a/win/configure
+++ b/win/configure
@@ -1960,13 +1960,13 @@ CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}
 #--------------------------------------------------------------------
 
 if test ${SHARED_BUILD} = 0 ; then
-    if test "${DBGX}" = "d"; then
+    if test "${DBGX}" = "g"; then
         RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
     else
         RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
     fi
 else
-    if test "${DBGX}" = "d"; then
+    if test "${DBGX}" = "g"; then
         RC_DEFINES="${RC_DEFINE} DEBUG"
     else
         RC_DEFINES=""
diff --git a/win/configure.in b/win/configure.in
index 0ec6606..00f0e7b 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.67 2003/02/15 02:16:33 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.68 2003/03/01 01:22:46 hobbs Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.13)
@@ -340,13 +340,13 @@ CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}
 #--------------------------------------------------------------------
 
 if test ${SHARED_BUILD} = 0 ; then
-    if test "${DBGX}" = "d"; then
+    if test "${DBGX}" = "g"; then
         RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
     else
         RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
     fi
 else
-    if test "${DBGX}" = "d"; then
+    if test "${DBGX}" = "g"; then
         RC_DEFINES="${RC_DEFINE} DEBUG"
     else
         RC_DEFINES=""
diff --git a/win/rules.vc b/win/rules.vc
index 583d8e9..3cc84b0 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -10,7 +10,7 @@
 # Copyright (c) 2001-2002 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.10 2003/01/05 00:44:24 davygrvy Exp $
+# RCS: @(#) $Id: rules.vc,v 1.11 2003/03/01 01:22:46 hobbs Exp $
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
@@ -192,15 +192,15 @@ TCL_USE_STATIC_PACKAGES = 0
 # by accident.
 #----------------------------------------------------------
 
-SUFX	    = tsdx
+SUFX	    = tsgx
 
 !if $(DEBUG)
 BUILDDIRTOP = Debug
-DBGX	    = d
+DBGX	    = g
 !else
 BUILDDIRTOP = Release
 DBGX	    =
-SUFX	    = $(SUFX:d=)
+SUFX	    = $(SUFX:g=)
 !endif
 
 TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
-- 
cgit v0.12