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 /rules | |
| 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 'rules')
| -rw-r--r-- | rules/build-perl.mk | 4 | ||||
| -rw-r--r-- | rules/shell-wrapper.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-perl.mk b/rules/build-perl.mk index cd23185462..e13185d85d 100644 --- a/rules/build-perl.mk +++ b/rules/build-perl.mk @@ -60,8 +60,8 @@ install: install_$1_$2 .PHONY: install_$1_$2 install_$1_$2: $1/$2/$$($1_$2_PROG) - $$(INSTALL_DIR) "$$($1_$2_INSTALL_IN)" - $$(INSTALL_SCRIPT) $$(INSTALL_OPTS) $$< "$$($1_$2_INSTALL_IN)" + $$(call INSTALL_DIR,"$$($1_$2_INSTALL_IN)") + $$(call INSTALL_SCRIPT,$$(INSTALL_OPTS),$$<,"$$($1_$2_INSTALL_IN)") endif endif diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index 1315ea35a4..6cd3cdb49d 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -63,7 +63,7 @@ install: install_$1_$2_wrapper .PHONY: install_$1_$2_wrapper install_$1_$2_wrapper: WRAPPER=$$(DESTDIR)$$(bindir)/$$($1_$2_INSTALL_SHELL_WRAPPER_NAME) install_$1_$2_wrapper: - $$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)" + $$(call INSTALL_DIR,"$$(DESTDIR)$$(bindir)") "$$(RM)" $$(RM_OPTS) "$$(WRAPPER)" $$(CREATE_SCRIPT) "$$(WRAPPER)" echo '#!$$(SHELL)' >> "$$(WRAPPER)" |