summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--win/Makefile.in7
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in3
4 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a27bd1b..23e0918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-03 Mo DeJong <mdejong@redhat.com>
+
+ * win/Makefile.in: Don't use VPSEP, instead just use :
+ in the VPATH.
+ * win/configure: Regen.
+ * win/configure.in: Don't subst VPSEP.
+
2001-07-03 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* library/xmfbox.tcl (tkMotifFDialog_ActivateSEnt): Added missing
diff --git a/win/Makefile.in b/win/Makefile.in
index b0e3531..777dc2c 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.38 2001/06/27 02:06:13 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.39 2001/07/04 00:19:48 mdejong Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -140,10 +140,9 @@ DEPARG = "$(shell $(CYGPATH) $(PATHTYPE) $<)"
# Setting the VPATH variable to a list of paths will cause the
# makefile to look into these paths when resolving .c to .obj
-# dependencies. Note the ':' to avoid autoconf's habit of deleting
-# all VPATH lines without an explicit ':' in it.
+# dependencies.
-VPATH = $(GENERIC_DIR)@VPSEP@$(WIN_DIR)@VPSEP@$(UNIX_DIR)@VPSEP@$(XLIB_DIR)@VPSEP@$(RC_DIR) # :
+VPATH = $(GENERIC_DIR):$(WIN_DIR):$(UNIX_DIR):$(XLIB_DIR):$(RC_DIR)
# warning flags
CFLAGS_WARNING = @CFLAGS_WARNING@
diff --git a/win/configure b/win/configure
index 1f2f634..170b0e9 100755
--- a/win/configure
+++ b/win/configure
@@ -1665,7 +1665,6 @@ fi
-
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -1851,7 +1850,6 @@ s%@CFG_TK_EXPORT_FILE_SUFFIX@%$CFG_TK_EXPORT_FILE_SUFFIX%g
s%@TK_SHARED_BUILD@%$TK_SHARED_BUILD%g
s%@PATHTYPE@%$PATHTYPE%g
s%@CYGPATH@%$CYGPATH%g
-s%@VPSEP@%$VPSEP%g
s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g
s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g
s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g
diff --git a/win/configure.in b/win/configure.in
index 01fd69b..edceb23 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.32 2001/06/27 01:15:16 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.33 2001/07/04 00:19:48 mdejong Exp $
AC_INIT(../generic/tk.h)
@@ -213,7 +213,6 @@ AC_SUBST(TK_SHARED_BUILD)
AC_SUBST(PATHTYPE)
AC_SUBST(CYGPATH)
-AC_SUBST(VPSEP)
AC_SUBST(CFLAGS_DEFAULT)
AC_SUBST(CFLAGS_DEBUG)
AC_SUBST(CFLAGS_OPTIMIZE)