aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPeter Andersson <peppe@erlang.org>2015-03-06 12:22:01 +0100
committerPeter Andersson <peppe@erlang.org>2015-03-06 12:22:01 +0100
commit41ede9c2b79cd67bf4d6d6ba5953e3e311c7574b (patch)
treeb64baca48d74df6b051080e96a9b0d74c1a57ebd /lib
parent6b635b516a6721d5b6a7b08e501004857175a183 (diff)
parent96274bb8ce9904999e7137e3082d3dde18e75c7d (diff)
downloadotp-41ede9c2b79cd67bf4d6d6ba5953e3e311c7574b.tar.gz
otp-41ede9c2b79cd67bf4d6d6ba5953e3e311c7574b.tar.bz2
otp-41ede9c2b79cd67bf4d6d6ba5953e3e311c7574b.zip
Merge branch 'peppe/common_test/makefile_issue' into maint
* peppe/common_test/makefile_issue: Have make ignore the chmod command line in the makefile if it fails OTP-12179
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/priv/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in
index 5a9fabbe45..1bc6b82ebb 100644
--- a/lib/common_test/priv/Makefile.in
+++ b/lib/common_test/priv/Makefile.in
@@ -71,7 +71,7 @@ debug opt:
$(V_at)sed -e 's;@CT_VSN@;$(VSN);' \
-e 's;@TS_VSN@;$(TEST_SERVER_VSN);' \
../install.sh.in > install.sh
- $(V_at)chmod 775 install.sh
+ - $(V_at)chmod -f 775 install.sh
docs: