aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-04 16:32:09 +0100
committerRickard Green <[email protected]>2019-03-04 16:32:09 +0100
commitb32a929bbb287c318f44cb0ecf17716c480f11ee (patch)
treea972ffc586e100d6b1c9cbca287daba62b9ac067 /erts/configure.in
parent934f9974eb6bec43cd9445ec0f5019a4d1389428 (diff)
parent2599dcfc973d30cfdf438d4587885eda154522ab (diff)
downloadotp-b32a929bbb287c318f44cb0ecf17716c480f11ee.tar.gz
otp-b32a929bbb287c318f44cb0ecf17716c480f11ee.tar.bz2
otp-b32a929bbb287c318f44cb0ecf17716c480f11ee.zip
Merge 'rickard/make-fixes-20/OTP-15551' into 'rickard/make-fixes-21/OTP-15551'
* rickard/make-fixes-20/OTP-15551: Fix install phase in build system - Install of (mainly) documentation caused rebuild and modification of the source tree even when the source previously had been built. Also otp_patch_apply modified the source tree when updating documentation. This messed up the installation if installation was performed by another user than the user that originally built the system which not is an uncommon scenario. - Some documentation was installed by copying files instead of installing the files which caused faulty access rights on files. - The documentation was not properly updated when applying a patch using otp_patch_apply.
Diffstat (limited to 'erts/configure.in')
-rw-r--r--erts/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 9245e4dc90..53e8bd683a 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4326,7 +4326,6 @@ AC_CONFIG_FILES([../make/make_emakefile:../make/make_emakefile.in],
dnl
dnl The ones below should be moved to their respective lib
dnl
-dnl ../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
AC_CONFIG_FILES([
../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in
../lib/crypto/c_src/$host/Makefile:../lib/crypto/c_src/Makefile.in
@@ -4334,4 +4333,6 @@ AC_CONFIG_FILES([
../lib/tools/c_src/$host/Makefile:../lib/tools/c_src/Makefile.in
])
+AC_CONFIG_FILES([../make/install_dir_data.sh:../make/install_dir_data.sh.in], [chmod +x ../make/install_dir_data.sh])
+
AC_OUTPUT