From e650f53e6b046fc7a76dd80a507ea2b1fd4d3ae8 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Mon, 31 May 2010 13:07:28 +0000 Subject: [PATCH] 2010-05-31 Robert Jordan * configure.in: Windows: mcs_topdir_from_srcdir must not be converted to a Win32 path unless it's already a cygwin path. Fixes --with-mcs-docs for in-tree mcs builds. svn path=/trunk/mono/; revision=158211 --- ChangeLog | 6 ++++++ configure.in | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d1697f8615..64527b59b9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-05-31 Robert Jordan + + * configure.in: Windows: mcs_topdir_from_srcdir must not be + converted to a Win32 path unless it's already a cygwin path. + Fixes --with-mcs-docs for in-tree mcs builds. + 2010-05-28 Robert Jordan * configure.in: Fix mcs_topdir* for the Windows build. diff --git a/configure.in b/configure.in index e02f7e92f8c..1b90ba5114e 100644 --- a/configure.in +++ b/configure.in @@ -478,10 +478,14 @@ mcs_topdir=$(cd "$srcdir/$mcsdir" && pwd) mcs_topdir_from_srcdir='$(top_builddir)'/$mcsdir fi -# Convert paths to Windows syntax. +# Convert mcs_topdir* paths to Windows syntax. if test x$cross_compiling$host_win32 = xnoyes; then - mcs_topdir=$(cygpath -m -a $mcs_topdir) - mcs_topdir_from_srcdir=$(cygpath -m -a $mcs_topdir_from_srcdir) + mcs_topdir=$(cygpath -m $mcs_topdir) + case $mcs_topdir_from_srcdir in + /cygdrive/*) + mcs_topdir_from_srcdir=$(cygpath -m $mcs_topdir_from_srcdir) + ;; + esac fi ## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. -- 2.25.1