From b1fff745a534ae7cb1d170a7df3c7ec124928997 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 20 Mar 2011 01:25:40 +0000 Subject: [PATCH] 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. --- mk/install.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/install.mk.in b/mk/install.mk.in index 6d9f902..2808c1f 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 -- 1.7.10.4