From 1b52cffda665edefd3091b496aabef4f92873813 Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 30 Apr 2003 14:02:32 +0000 Subject: [haddock @ 2003-04-30 14:02:32 by simonmar] When installing on Windows, run cygpath over $(HADDOCKLIB) so that haddock (a mingw program, built by GHC) can understand it. You still need to be in a cygwin environment to run Haddock, because of the shell script wrapper. --- src/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index a5cdbfda..68e83905 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,13 +17,21 @@ ifeq "$(BIN_DIST)" "1" HADDOCKLIB=$$\"\"libdir/haddock HADDOCKBIN=$$\"\"libexecdir/$(HS_PROG) else +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +HADDOCKLIB=$(shell cygpath --mixed $(libdir)) +else HADDOCKLIB=$(libdir) +endif # mingw HADDOCKBIN=$(libexecdir)/$(HS_PROG) endif # BIN_DIST else +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +HADDOCKLIB=$(shell cygpath --mixed $(FPTOOLS_TOP_ABS)/haddock/html) +else HADDOCKLIB=$(FPTOOLS_TOP_ABS)/haddock/html -HADDOCKBIN=$(FPTOOLS_TOP_ABS)/haddock/src/$(HS_PROG) endif +HADDOCKBIN=$(FPTOOLS_TOP_ABS)/haddock/src/$(HS_PROG) +endif # INSTALLING HAPPY_OPTS += $(GHC_HAPPY_OPTS) -- cgit v1.2.3