diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-03-20 01:25:40 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-03-20 01:25:40 +0000 |
| commit | b1fff745a534ae7cb1d170a7df3c7ec124928997 (patch) | |
| tree | a15e99defd1f11b93c50e16fe3750a2a29ab75ab /mk/install.mk.in | |
| parent | 2add9acb1f9b5ccf4223df8686040f10c2506283 (diff) | |
| download | haskell-b1fff745a534ae7cb1d170a7df3c7ec124928997.tar.gz | |
Change how we compute install paths on cygwin
We used to have
MK_INSTALL_DEST = "$(shell cygpath $1)"
but this meant we ended up with
"$(shell cygpath "[...]/html/`basename $$i`")"
and the $(...) gets evaluated before the makefile rule, so the for loop
hasn't been run, and so $i isn't defined. So we were taking the basename
of the empty string, meaning docs weren't being installed in the right
place.
Now we have
MK_INSTALL_DEST = $$(cygpath $1)
so the evaluation happens in the shell, while the for loop is running.
Diffstat (limited to 'mk/install.mk.in')
| -rw-r--r-- | mk/install.mk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/install.mk.in b/mk/install.mk.in index 6d9f9027f9..2808c1f784 100644 --- a/mk/install.mk.in +++ b/mk/install.mk.in @@ -163,7 +163,7 @@ INSTALL_DIR = $(INSTALL) -m 755 -d $(call MK_INSTALL_DEST,$1) # (This will make a Cygwin build run slowly # because of all those shell invocations.) ifeq "$(OSTYPE)" "cygwin" -MK_INSTALL_DEST = "$(shell cygpath $1)" +MK_INSTALL_DEST = $$(cygpath $1) else MK_INSTALL_DEST = $1 endif |