Index: configure.ac
===================================================================
--- configure.ac	(revision 8732)
+++ configure.ac	(working copy)
@@ -1534,6 +1638,21 @@
 ompi_show_subtitle "Wrapper compiler flags"
 OMPI_SETUP_WRAPPER_FINAL

+PATH_CONVERTOR="echo"
+case $host in
+    *-*-cygwin)
+        if test "$ompi_cv_c_compiler_vendor" = "microsoft"; then
+          PATH_CONVERTOR="cygpath -m"
+        fi
+        ;;
+    *-*-mingw)
+        ;;
+    *)
+        ;;
+esac
+ompi_show_subtitle "Path conversion utilities   $PATH_CONVERTOR"
+AC_SUBST(PATH_CONVERTOR)
+
 ############################################################################
 # Party on
 ############################################################################
Index: ompi/tools/ompi_info/Makefile.am
===================================================================
--- ompi/tools/ompi_info/Makefile.am	(revision 8732)
+++ ompi/tools/ompi_info/Makefile.am	(working copy)
@@ -17,12 +17,16 @@
 #

 AM_CPPFLAGS = \
-            -DOMPI_PREFIX="\"$(prefix)\"" \
-            -DOMPI_BINDIR="\"$(bindir)\"" \
-            -DOMPI_LIBDIR="\"$(libdir)\"" \
-            -DOMPI_INCDIR="\"$(includedir)\"" \
-            -DOMPI_PKGLIBDIR="\"$(pkglibdir)\"" \
-            -DOMPI_SYSCONFDIR="\"$(sysconfdir)\"" \
+            -DOMPI_PREFIX=\""`@PATH_CONVERTOR@ '$(prefix)'`\"" \
+            -DOMPI_BINDIR=\""`@PATH_CONVERTOR@ '$(bindir)'`\"" \
+            -DOMPI_LIBDIR=\""`@PATH_CONVERTOR@ '$(libdir)'`\"" \
+            -DOMPI_INCDIR=\""`@PATH_CONVERTOR@ '$(includedir)'`\"" \
+            -DOMPI_PKGLIBDIR=\""`@PATH_CONVERTOR@ '$(pkglibdir)'`\"" \
+            -DOMPI_SYSCONFDIR=\""`@PATH_CONVERTOR@ '$(sysconfdir)'`\"" \
+            -DOMPI_CC_ABSOLUTE=\""`@PATH_CONVERTOR@ '@OMPI_CC_ABSOLUTE@'`\"" \
+            -DOMPI_CXX_ABSOLUTE=\""`@PATH_CONVERTOR@ '@OMPI_CXX_ABSOLUTE@'`\"" \
+            -DOMPI_F77_ABSOLUTE=\""`@PATH_CONVERTOR@ '@OMPI_F77_ABSOLUTE@'`\"" \
+            -DOMPI_F90_ABSOLUTE=\""`@PATH_CONVERTOR@ '@OMPI_F90_ABSOLUTE@'`\"" \
             -DOMPI_CONFIGURE_USER="\"@OMPI_CONFIGURE_USER@\"" \
             -DOMPI_CONFIGURE_HOST="\"@OMPI_CONFIGURE_HOST@\"" \
             -DOMPI_CONFIGURE_DATE="\"@OMPI_CONFIGURE_DATE@\"" \
@@ -37,10 +41,6 @@
             -DOMPI_BUILD_FCFLAGS="\"@FCFLAGS@\"" \
             -DOMPI_BUILD_LDFLAGS="\"@LDFLAGS@\"" \
             -DOMPI_BUILD_LIBS="\"@LIBS@\"" \
-            -DOMPI_CC_ABSOLUTE="\"@OMPI_CC_ABSOLUTE@\"" \
-            -DOMPI_CXX_ABSOLUTE="\"@OMPI_CXX_ABSOLUTE@\"" \
-            -DOMPI_F77_ABSOLUTE="\"@OMPI_F77_ABSOLUTE@\"" \
-            -DOMPI_F90_ABSOLUTE="\"@OMPI_F90_ABSOLUTE@\"" \
             -DOMPI_WANT_SVN=\"@OMPI_WANT_SVN@\" \
             -DOMPI_SVN_R=\"@OMPI_SVN_R@\" \
             -DORTE_WANT_SVN=\"@ORTE_WANT_SVN@\" \
Index: ompi/tools/wrappers/Makefile.am
===================================================================
--- ompi/tools/wrappers/Makefile.am	(revision 8732)
+++ ompi/tools/wrappers/Makefile.am	(working copy)
@@ -27,9 +27,9 @@
 # autoconf.

 AM_CPPFLAGS   = \
-      -DOMPI_PREFIX="\"$(prefix)\"" \
-      -DOMPI_INCDIR="\"$(includedir)\"" \
-      -DOMPI_LIBDIR="\"$(libdir)\"" \
+      -DOMPI_PREFIX=\""`@PATH_CONVERTOR@ '$(prefix)'`\"" \
+      -DOMPI_INCDIR=\""`@PATH_CONVERTOR@ '$(includedir)'`\"" \
+      -DOMPI_LIBDIR=\""`@PATH_CONVERTOR@ '$(libdir)'`\"" \
       -DOMPI_FC_MODULE_FLAG="\"$(OMPI_FC_MODULE_FLAG)\""

 if WANT_INSTALL_HEADERS
Index: opal/mca/base/Makefile.am
===================================================================
--- opal/mca/base/Makefile.am   (revision 8734)
+++ opal/mca/base/Makefile.am   (working copy)
@@ -20,9 +20,9 @@
 # (by default)

 AM_CPPFLAGS = \
-       $(OPAL_LTDL_CPPFLAGS) \
-        -DOMPI_PKGLIBDIR=\"$(pkglibdir)\" \
-        -DOMPI_SYSCONFDIR=\"$(sysconfdir)\"
+        $(OPAL_LTDL_CPPFLAGS) \
+        -DOMPI_PKGLIBDIR=\""`@PATH_CONVERTOR@ '$(pkglibdir)'`\"" \
+        -DOMPI_SYSCONFDIR=\""`@PATH_CONVERTOR@ '$(sysconfdir)'`\""

 noinst_LTLIBRARIES = libmca_base.la

Index: opal/tools/wrappers/Makefile.am
===================================================================
--- opal/tools/wrappers/Makefile.am	(revision 8732)
+++ opal/tools/wrappers/Makefile.am	(working copy)
@@ -24,9 +24,9 @@
 	help-opal-wrapper.txt

 AM_CPPFLAGS = \
-            -DOPAL_LIBDIR="\"$(libdir)\"" \
-            -DOPAL_INCDIR="\"$(includedir)\"" \
-            -DOPAL_PKGDATADIR="\"$(pkgdatadir)\""
+            -DOPAL_LIBDIR=\""`@PATH_CONVERTOR@ '$(libdir)'`\"" \
+            -DOPAL_INCDIR=\""`@PATH_CONVERTOR@ '$(includedir)'`\"" \
+            -DOPAL_PKGDATADIR=\""`@PATH_CONVERTOR@ '$(pkgdatadir)'`\""

 bin_PROGRAMS = opal_wrapper

Index: opal/util/Makefile.am
===================================================================
--- opal/util/Makefile.am	(revision 8732)
+++ opal/util/Makefile.am	(working copy)
@@ -18,7 +18,7 @@

 SUBDIRS = keyval

-AM_CPPFLAGS = -DOMPI_PKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -DOMPI_PKGDATADIR=\"`$(@PATH_CONVERSION@) "$(pkgdatadir)"`\"
 AM_LFLAGS = -Popal_show_help_yy
 LEX_OUTPUT_ROOT = lex.opal_show_help_yy

