From bcee1e75734a4b8a9311941b9a62838921ef1e92 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Fri, 30 May 2003 16:50:45 +0000
Subject: [haddock @ 2003-05-30 16:50:45 by sof] cygpath: for now, steer clear
 of --mixed

---
 src/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 68e83905..f4766d43 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,9 @@ HADDOCKLIB=$$\"\"libdir/haddock
 HADDOCKBIN=$$\"\"libexecdir/$(HS_PROG)
 else
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-HADDOCKLIB=$(shell cygpath --mixed $(libdir))
+# --mixed is only provided by newer versions of cygpath (1.2 doesn't have it, for instance.)
+#HADDOCKLIB=$(shell cygpath --mixed $(libdir))
+HADDOCKLIB=$(shell cygpath -w $(libdir) | sed -e 's%\\%/%g')
 else
 HADDOCKLIB=$(libdir)
 endif # mingw
@@ -26,13 +28,17 @@ HADDOCKBIN=$(libexecdir)/$(HS_PROG)
 endif # BIN_DIST
 else
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-HADDOCKLIB=$(shell cygpath --mixed $(FPTOOLS_TOP_ABS)/haddock/html)
+# See above comment re: --mixed
+#HADDOCKLIB=$(shell cygpath --mixed $(FPTOOLS_TOP_ABS)/haddock/html)
+HADDOCKLIB=$(shell cygpath -w $(FPTOOLS_TOP_ABS)/haddock/html | sed -e 's%\\%/%g')
 else
 HADDOCKLIB=$(FPTOOLS_TOP_ABS)/haddock/html
 endif
 HADDOCKBIN=$(FPTOOLS_TOP_ABS)/haddock/src/$(HS_PROG)
 endif # INSTALLING
 
+HADDOCKLIB=$(shell cygpath -w $(libdir) | sed -e 's%\\%/%g')
+
 HAPPY_OPTS += $(GHC_HAPPY_OPTS)
 
 INSTALLED_SCRIPT_PROG  = haddock-$(ProjectVersion)
-- 
cgit v1.2.3