(PLATFORM, slashify): Remove double slashes.

diff --git a/ChangeLog b/ChangeLog
index c00a86cb2cb309fd6e1f145ad82a8833f4a84ec9..380c3d2ecc1a8d24310053b3fa9d7e42ea1e4280 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/lily.scm (PLATFORM, slashify): Remove double slashes.
+
 2005-06-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * input/mutopia/R.Schumann/romanze-op28-2.ly (leftb): bugfix.

diff --git a/scm/lily.scm b/scm/lily.scm
index e427012ad1cb64593d81b3434dc7877e8ddfabc7..2ed241a645272f00c747d942b7d30d10b5aaec7b 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -95,9 +95,11 @@
   ((windows)
    (define native-getcwd getcwd)
    (define (slashify x)
-     (if (string-index x #\/)
+     (if (string-index x #\\)
         x
-        (string-regexp-substitute "\\\\" "/" x)))
+        (string-regexp-substitute
+         "//*" "/"
+         (string-regexp-substitute "\\\\" "/" x))))
    ;; FIXME: this prints a warning.
   (define-public (ly-getcwd)
      (slashify (native-getcwd))))