aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-03-05 23:50:39 +0100
committerErlang/OTP <[email protected]>2019-03-05 23:50:39 +0100
commit3ec4257f6f93656d3f58f864ed8aa585788b7d0f (patch)
treee0aa9125a27b3acd70714d44dd4e1b5c9c702304 /erts/configure.in
parentf30b1052c7097a95faaba272feccc6190682a7f8 (diff)
parentb32a929bbb287c318f44cb0ecf17716c480f11ee (diff)
downloadotp-3ec4257f6f93656d3f58f864ed8aa585788b7d0f.tar.gz
otp-3ec4257f6f93656d3f58f864ed8aa585788b7d0f.tar.bz2
otp-3ec4257f6f93656d3f58f864ed8aa585788b7d0f.zip
Merge branch 'rickard/make-fixes-21/OTP-15551' into maint-21
* rickard/make-fixes-21/OTP-15551: Fix install phase in build system
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