summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-01-06 22:30:30 +0000
committerIan Lynagh <igloo@earth.li>2011-01-06 22:30:30 +0000
commit57e2a81c589103b50da80a9e378b1a11285bd521 (patch)
tree5974b3fbc3c88abac38e35a7d790f972b404a363 /utils
parentaf6b7e5d76247e9577ab6b9ad8c70dd90df1105d (diff)
downloadhaskell-57e2a81c589103b50da80a9e378b1a11285bd521.tar.gz
On Cygwin, use a Cygwin-style path for /bin/install's destination
cygwin's /bin/install doesn't set file modes correctly if the destination path is a C: style path: $ /bin/install -c -m 644 foo /cygdrive/c/cygwin/home/ian/foo2 $ /bin/install -c -m 644 foo c:/cygwin/home/ian/foo3 $ ls -l foo* -rw-r--r-- 1 ian None 0 2011-01-06 18:28 foo -rw-r--r-- 1 ian None 0 2011-01-06 18:29 foo2 -rwxrwxrwx 1 ian None 0 2011-01-06 18:29 foo3 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
Diffstat (limited to 'utils')
-rw-r--r--utils/ghc-pkg/ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 67ca1555ab..d038114745 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -99,7 +99,7 @@ install: install_utils/ghc-pkg_link
.PNONY: install_utils/ghc-pkg_link
install_utils/ghc-pkg_link:
- $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+ $(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/ghc-pkg"
$(LN_S) ghc-pkg-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghc-pkg"
endif