diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-06 22:30:30 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-06 22:30:30 +0000 |
| commit | 57e2a81c589103b50da80a9e378b1a11285bd521 (patch) | |
| tree | 5974b3fbc3c88abac38e35a7d790f972b404a363 /driver | |
| parent | af6b7e5d76247e9577ab6b9ad8c70dd90df1105d (diff) | |
| download | haskell-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 'driver')
| -rw-r--r-- | driver/ghci/ghc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk index 57ae1b28ed..31e84d6abb 100644 --- a/driver/ghci/ghc.mk +++ b/driver/ghci/ghc.mk @@ -17,7 +17,7 @@ install: install_driver_ghci .PHONY: install_driver_ghci install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion) install_driver_ghci: - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" + $(call INSTALL_DIR,"$(DESTDIR)$(bindir)") "$(RM)" $(RM_OPTS) "$(WRAPPER)" $(CREATE_SCRIPT) "$(WRAPPER)" echo '#!$(SHELL)' >> "$(WRAPPER)" @@ -52,7 +52,7 @@ install : install_driver_ghcii install_driver_ghcii: GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh install_driver_ghcii: GHCII_SCRIPT_VERSIONED = $(DESTDIR)$(bindir)/ghcii-$(ProjectVersion).sh install_driver_ghcii: - $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(call INSTALL_DIR,$(DESTDIR)$(bindir)) "$(RM)" $(RM_OPTS) $(GHCII_SCRIPT) echo "#!$(SHELL)" >> $(GHCII_SCRIPT) echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT) |