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 /includes/ghc.mk | |
| 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 'includes/ghc.mk')
| -rw-r--r-- | includes/ghc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 68055b564e..1f7ea116e0 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -186,10 +186,10 @@ install: install_includes .PHONY: install_includes install_includes : - $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)") for d in $(includes_subdirs); do \ - $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)/$$d"; \ + $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)/$$d"); \ done for i in $(subst includes/,,$(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) includes/$$i "$(DESTDIR)$(ghcheaderdir)/$$i"; \ + $(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$$i,"$(DESTDIR)$(ghcheaderdir)/$$i"); \ done |