From 57e2a81c589103b50da80a9e378b1a11285bd521 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 6 Jan 2011 22:30:30 +0000 Subject: 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 --- rules/build-perl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rules/build-perl.mk') 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 -- cgit v1.2.1