X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Finstall.mk.in;h=2808c1f784a8455f00cb1791f0242421fa519a7a;hp=3d741589820d840339e84687097e37be3f785d42;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=57e2a81c589103b50da80a9e378b1a11285bd521

diff --git a/mk/install.mk.in b/mk/install.mk.in
index 3d74158..2808c1f 100644
--- a/mk/install.mk.in
+++ b/mk/install.mk.in
@@ -159,11 +159,13 @@ INSTALL_DIR     = $(INSTALL) -m 755 -d $(call MK_INSTALL_DEST,$1)
 # This causes problems for bindisttest/checkBinaries.sh which then
 # thinks that e.g. the userguide HTML files are binaries.
 #
-# We therefore use a /cygdrive path if we are on cygwin
-ifeq '$(shell cygpath "c:/" 2> /dev/null)' ''
-MK_INSTALL_DEST = $1
+# We therefore use a /cygdrive path if we are on cygwin (only)
+#   (This will make a Cygwin build run slowly 
+#    because of all those shell invocations.)
+ifeq "$(OSTYPE)" "cygwin"
+MK_INSTALL_DEST = $$(cygpath $1)
 else
-MK_INSTALL_DEST = "$(shell cygpath $1)"
+MK_INSTALL_DEST = $1
 endif
 
 #
@@ -179,3 +181,7 @@ endif
 # NB. we use negative tests here because for binary-distributions we cannot
 # test build-time variables at install-time, so they must default to on.
 
+ifneq "$(DESTDIR)" ""
+override DESTDIR := $(abspath $(DESTDIR))
+endif
+