From daaaa7768cb634eed14f66460b8fdf6d85d719c1 Mon Sep 17 00:00:00 2001 From: Kevin B Kenny Date: Thu, 2 Dec 2004 18:40:06 +0000 Subject: workaround for a bug in cygpath that made safe-8.5-8.7 fail --- ChangeLog | 6 ++++++ win/Makefile.in | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a330bf..a1f37f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-02 Kevin B. Kenny + + * win/Makefile.in: Added a 'sed' in the setting of ROOT_DIR_NATIVE + to compensate for a bug in cygpath (at least version 1.36) that + leaves a trailing backslash on the end of the converted path. + 2004-12-02 Donal K. Fellows * generic/tclInterp.c (Alias,Target,Master): Rewrote these so that diff --git a/win/Makefile.in b/win/Makefile.in index 0820aba..dbc6894 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.84 2004/11/29 22:41:58 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.85 2004/12/02 18:40:17 kennykb Exp $ VERSION = @TCL_VERSION@ @@ -110,7 +110,7 @@ CYGPATH = @CYGPATH@ GENERIC_DIR_NATIVE = $(shell $(CYGPATH) '$(GENERIC_DIR)') WIN_DIR_NATIVE = $(shell $(CYGPATH) '$(WIN_DIR)') -ROOT_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)') +ROOT_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's/\\*$$//' ) LIBRARY_DIR = $(shell echo '$(ROOT_DIR_NATIVE)/library' | sed 's/\\/\//g' ) -- cgit v0.12