diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2004-12-02 18:40:06 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2004-12-02 18:40:06 (GMT) |
| commit | daaaa7768cb634eed14f66460b8fdf6d85d719c1 (patch) | |
| tree | 80395f8384fd98a09263ccfac9fb4e17a2d72c27 | |
| parent | 512b5b9ab9098ac6858e682aaa02a7172f1da0aa (diff) | |
| download | tcl-daaaa7768cb634eed14f66460b8fdf6d85d719c1.zip tcl-daaaa7768cb634eed14f66460b8fdf6d85d719c1.tar.gz tcl-daaaa7768cb634eed14f66460b8fdf6d85d719c1.tar.bz2 | |
workaround for a bug in cygpath that made safe-8.5-8.7 fail
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2004-12-02 Kevin B. Kenny <kennykb@acm.org> + + * 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 <donal.k.fellows@man.ac.uk> * 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' ) |