aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-04-16 16:37:40 +0200
committerErlang/OTP <[email protected]>2019-04-16 16:37:40 +0200
commit6bc51edfd7efb409230c0ca1dffb7508e65687f9 (patch)
treef8c4f992e647dadaca250a0a009efcf333ca40a1 /erts
parent8e033a488a9eff5589c4203785c18effd09e4a07 (diff)
parent2599dcfc973d30cfdf438d4587885eda154522ab (diff)
downloadotp-6bc51edfd7efb409230c0ca1dffb7508e65687f9.tar.gz
otp-6bc51edfd7efb409230c0ca1dffb7508e65687f9.tar.bz2
otp-6bc51edfd7efb409230c0ca1dffb7508e65687f9.zip
Merge branch 'rickard/make-fixes-20/OTP-15551' into maint-20
* rickard/make-fixes-20/OTP-15551: Fix install phase in build system
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 1ae91f293f..7e262d2bcc 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -5092,7 +5092,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/ic/c_src/$host/Makefile:../lib/ic/c_src/Makefile.in
../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in
@@ -5102,4 +5101,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