Merge pull request ocaml#63 from dra27/fix-win-configure

Fix configuration process on Windows
stedolan · Sep 9, 2024 · f1ddc0a · f1ddc0a
2 parents 848db20 + 72d2152
commit f1ddc0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/configure b/configure
@@ -289,6 +289,9 @@ if [ -z "$ocaml_sitelib" ]; then
 fi
 
 ocamlpath="${ocaml_sitelib}"
+if [ ${use_cygpath} -gt 0 ]; then
+    cygpath_to_unix ocamlpath
+fi
 if [ $ocaml_major -ge 5 ]; then
     # OCaml 5.0+ installs its own META files under the stdlib directory.
     # If findlib has been configured -sitelib $(ocamlc -where) then there's

diff --git a/tools/patch b/tools/patch
@@ -9,7 +9,7 @@ varvalue="$2"
 if [ "${USE_CYGPATH}" = "1" ]; then
     #varvalue="$(echo "$varvalue" | sed -e 's;/;\\;g')"
     varvalue="$(cygpath -w -l $3 "$varvalue")"
-    varvalue="$(echo "$varvalue" | sed -e 's;\\;\\\\\\\\;g')"
+    varvalue="$(echo "$varvalue" | sed -e 's;\\;\\\\\\\\;g;s/;/\\;/g')"
     # e.g. c:\file is transformed to c:\\\\file
 else
     case `uname` in