Commit b1fff745 authored by Ian Lynagh's avatar Ian Lynagh

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.
parent 2add9acb
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment