From 1e72aa61f0e0293bad31b6f39ed1e54aef7a075c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 21 Nov 2006 22:52:41 +0000 Subject: [PATCH] Reverting Janet's cygdrive change which she says breaks other Win32 builds. Until Cygwin's version of Make gets fixed, use the mingw Make instead. --- configure/tools/convertRelease.pl | 4 +++- src/makeBaseApp/makeBaseApp.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure/tools/convertRelease.pl b/configure/tools/convertRelease.pl index eb92cd233..7265b3101 100755 --- a/configure/tools/convertRelease.pl +++ b/configure/tools/convertRelease.pl @@ -337,7 +337,9 @@ sub UnixPath { sub LocalPath { my ($newpath) = @_; - if ($^O eq "darwin") { + if ($^O eq "cygwin") { + $newpath =~ s{^/cygdrive/([a-zA-Z])/}{$1:/}; + } elsif ($^O eq "darwin") { # These rules are likely to be site-specific $newpath =~ s{^/private/var/auto\.home/}{/home/}; # APS } diff --git a/src/makeBaseApp/makeBaseApp.pl b/src/makeBaseApp/makeBaseApp.pl index da8352eb6..d6f69a3fb 100755 --- a/src/makeBaseApp/makeBaseApp.pl +++ b/src/makeBaseApp/makeBaseApp.pl @@ -494,7 +494,9 @@ sub UnixPath { sub LocalPath { my ($newpath) = @_; - if ($^O eq "darwin") { + if ($^O eq "cygwin") { + $newpath =~ s{^/cygdrive/([a-zA-Z])/}{$1:/}; + } elsif ($^O eq "darwin") { # These rules are likely to be site-specific $newpath =~ s{^/private/var/auto\.home/}{/home/}; # APS }