Subject: [alpine-aports] [PATCH] testing/erlang: update to 18.0.1

From: Marlus Saraiva <[email-masked]>
Date: Fri, 3 Jul 2015 04:20:11 +0000

---
 ...at-man-pages-and-do-not-install-miscellan.patch |   37 +
 testing/erlang/0002-Remove-rpath.patch             |   28 +
 testing/erlang/0003-Do-not-install-C-sources.patch |  143 +++
 .../erlang/0004-Do-not-install-Java-sources.patch  |   28 +
 ...all-nteventlog-and-related-doc-files-on-n.patch |   57 ++
 .../0006-Do-not-install-erlang-sources.patch       |  858 +++++++++++++++++
 ...7-Split-off-webtool-dependency-from-tools.patch |   38 +
 testing/erlang/0010-fix-nteventlog-remove.patch    |   11 +
 testing/erlang/0020-remove-private-unit32.patch    |   11 +
 testing/erlang/0030-replace_glibc_check.patch      |   20 +
 .../erlang/0040-otp-update-version-18.0.1.patch    |   86 ++
 testing/erlang/APKBUILD                            |  107 +--
 ...at-man-pages-and-do-not-install-miscellan.patch |   41 -
 testing/erlang/otp-0002-Remove-rpath.patch         |   32 -
 .../erlang/otp-0003-Do-not-install-C-sources.patch |  161 ----
 .../otp-0004-Do-not-install-Java-sources.patch     |   32 -
 ...all-nteventlog-and-related-doc-files-on-n.patch |   61 --
 .../otp-0006-Do-not-install-erlang-sources.patch   | 1006 --------------------
 ...7-Split-off-webtool-dependency-from-tools.patch |   40 -
 .../erlang/otp-0008-Introduce-os-getenv-2.patch    |   63 --
 ...es-support-for-SSLv3-protocol-because-it-.patch |  100 --
 testing/erlang/remove-private-unit32.patch         |   11 -
 testing/erlang/replace_glibc_check.patch           |   20 -
 23 files changed, 1371 insertions(+), 1620 deletions(-)
 create mode 100644 testing/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
 create mode 100644 testing/erlang/0002-Remove-rpath.patch
 create mode 100644 testing/erlang/0003-Do-not-install-C-sources.patch
 create mode 100644 testing/erlang/0004-Do-not-install-Java-sources.patch
 create mode 100644 testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 create mode 100644 testing/erlang/0006-Do-not-install-erlang-sources.patch
 create mode 100644 testing/erlang/0007-Split-off-webtool-dependency-from-tools.patch
 create mode 100644 testing/erlang/0010-fix-nteventlog-remove.patch
 create mode 100644 testing/erlang/0020-remove-private-unit32.patch
 create mode 100644 testing/erlang/0030-replace_glibc_check.patch
 create mode 100644 testing/erlang/0040-otp-update-version-18.0.1.patch
 delete mode 100644 testing/erlang/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
 delete mode 100644 testing/erlang/otp-0002-Remove-rpath.patch
 delete mode 100644 testing/erlang/otp-0003-Do-not-install-C-sources.patch
 delete mode 100644 testing/erlang/otp-0004-Do-not-install-Java-sources.patch
 delete mode 100644 testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 delete mode 100644 testing/erlang/otp-0006-Do-not-install-erlang-sources.patch
 delete mode 100644 testing/erlang/otp-0007-Split-off-webtool-dependency-from-tools.patch
 delete mode 100644 testing/erlang/otp-0008-Introduce-os-getenv-2.patch
 delete mode 100644 testing/erlang/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
 delete mode 100644 testing/erlang/remove-private-unit32.patch
 delete mode 100644 testing/erlang/replace_glibc_check.patch

diff --git a/testing/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/testing/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
new file mode 100644
index 0000000..fef4a7f
--- /dev/null
+++ b/testing/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
@@ -0,0 +1,37 @@
+From: Peter Lemenkov <[email-masked]>
+Date: Thu, 25 Feb 2010 16:45:28 +0300
+Subject: [PATCH] Do not format man-pages and do not install miscellaneous
+ utilities for dealing with man-pages.
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+
+--- otp_src_18.0-orig/erts/etc/common/Makefile.in
++++ otp_src_18.0-fixed/erts/etc/common/Makefile.in
+@@ -551,10 +551,6 @@
+ ifneq ($(INSTALL_TOP_BIN),)
+ 	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
+ endif
+-ifneq ($(INSTALL_MISC),)
+-	$(INSTALL_DIR) "$(RELEASE_PATH)/misc"
+-	$(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc"
+-endif
+ ifneq ($(INSTALL_SRC),)
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"
+ 	$(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"
+--- otp_src_18.0-orig/erts/etc/unix/Install.src
++++ otp_src_18.0-fixed/erts/etc/unix/Install.src
+@@ -141,14 +141,5 @@
+ cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot .
+ cp -p $Name.boot start.boot
+ cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
+-#
+-# Fixing the man pages
+-#
+-
+-if [ -d "$ERL_ROOT/man" ]
+-then
+-    cd "$ERL_ROOT"
+-    ./misc/format_man_pages "$ERL_ROOT"
+-fi
+ 
+ exit 0
diff --git a/testing/erlang/0002-Remove-rpath.patch b/testing/erlang/0002-Remove-rpath.patch
new file mode 100644
index 0000000..71658fe
--- /dev/null
+++ b/testing/erlang/0002-Remove-rpath.patch
@@ -0,0 +1,28 @@
+From: Peter Lemenkov <[email-masked]>
+Date: Thu, 25 Feb 2010 16:57:43 +0300
+Subject: [PATCH] Remove rpath
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+
+--- otp_src_18.0-orig/lib/crypto/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/crypto/c_src/Makefile.in
+@@ -90,7 +90,7 @@
+ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
+ 
+ ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
++SSL_DED_LD_RUNTIME_LIBRARY_PATH =
+ CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
+ EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
+ else
+--- otp_src_18.0-orig/lib/crypto/priv/Makefile
++++ otp_src_18.0-fixed/lib/crypto/priv/Makefile
+@@ -61,7 +61,7 @@
+ # ----------------------------------------------------
+ 
+ $(SO_NIFLIB): $(OBJS)
+-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
++	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
+ 	-o $@ $^ -lcrypto
+ 
+ $(DLL_NIFLIB): $(OBJS)
diff --git a/testing/erlang/0003-Do-not-install-C-sources.patch b/testing/erlang/0003-Do-not-install-C-sources.patch
new file mode 100644
index 0000000..364c4ad
--- /dev/null
+++ b/testing/erlang/0003-Do-not-install-C-sources.patch
@@ -0,0 +1,143 @@
+From: Peter Lemenkov <[email-masked]>
+Date: Fri, 18 Jun 2010 23:41:33 +0400
+Subject: [PATCH] Do not install C sources
+
+Don't install *.c and *.o files.
+
+Excepts ones from the internal erl_interface. These
+API headers are necessary. See rhbz #818419 for the
+explanation why they're necessary for the low-level
+interaction with the Erlang nodes:
+
+https://bugzilla.redhat.com/818419
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+
+--- otp_src_18.0-orig/lib/asn1/c_src/Makefile
++++ otp_src_18.0-fixed/lib/asn1/c_src/Makefile
+@@ -143,8 +143,6 @@
+ ifneq ($(findstring ose,$(TARGET)),ose)
+ 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
+ endif
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
+ 
+ release_docs_spec:
+ 
+--- otp_src_18.0-orig/lib/crypto/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/crypto/c_src/Makefile.in
+@@ -200,14 +200,10 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
+ ifneq ($(findstring ose,$(TARGET)),ose)
+-	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
+ ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+-	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
+ endif
+ endif
+--- otp_src_18.0-orig/lib/erl_interface/src/Makefile.in
++++ otp_src_18.0-fixed/lib/erl_interface/src/Makefile.in
+@@ -905,14 +905,14 @@
+ 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
+ endif
+ 	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
+-	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
+-	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
+-	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
+-	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
+-	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
+-	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
+-	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
++	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"
++	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"
++	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"
++	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"
++	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"
++	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
++	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"
++	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"
+ 
+ release_docs:
+ 
+--- otp_src_18.0-orig/lib/ic/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/ic/c_src/Makefile.in
+@@ -145,12 +145,10 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
+-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
+--- otp_src_18.0-orig/lib/megaco/src/flex/Makefile.in
++++ otp_src_18.0-fixed/lib/megaco/src/flex/Makefile.in
+@@ -271,7 +271,7 @@
+ 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
+-	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
++	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
+--- otp_src_18.0-orig/lib/odbc/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/odbc/c_src/Makefile.in
+@@ -129,11 +129,8 @@
+ 
+ release_spec: opt
+ ifdef EXE_TARGET
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"
+ endif
+ 
+--- otp_src_18.0-orig/lib/os_mon/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/os_mon/c_src/Makefile.in
+@@ -126,8 +126,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
+ 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
+ 
+--- otp_src_18.0-orig/lib/runtime_tools/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/runtime_tools/c_src/Makefile.in
+@@ -157,10 +157,8 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ ifneq ($(findstring ose,$(TARGET)),ose)
+-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
+--- otp_src_18.0-orig/lib/tools/c_src/Makefile.in
++++ otp_src_18.0-fixed/lib/tools/c_src/Makefile.in
+@@ -198,8 +198,6 @@
+ RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
+ 
+ release_spec: all
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
+ ifneq ($(PROGS),)
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+ 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"
diff --git a/testing/erlang/0004-Do-not-install-Java-sources.patch b/testing/erlang/0004-Do-not-install-Java-sources.patch
new file mode 100644
index 0000000..799476c
--- /dev/null
+++ b/testing/erlang/0004-Do-not-install-Java-sources.patch
@@ -0,0 +1,28 @@
+From: Peter Lemenkov <[email-masked]>
+Date: Sat, 19 Jun 2010 09:25:18 +0400
+Subject: [PATCH] Do not install Java sources
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+
+--- otp_src_18.0-orig/lib/ic/java_src/com/ericsson/otp/ic/Makefile
++++ otp_src_18.0-fixed/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+@@ -113,8 +113,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+-	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
+ 
+--- otp_src_18.0-orig/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
++++ otp_src_18.0-fixed/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+@@ -120,8 +120,6 @@
+ 	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
+ 
+ release_spec: opt
+-	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+-	$(V_at)$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+ 	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(V_at)$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
+ 	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
diff --git a/testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
new file mode 100644
index 0000000..dcfa6bc
--- /dev/null
+++ b/testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -0,0 +1,57 @@
+From: Peter Lemenkov <[email-masked]>
+Date: Sat, 19 Jun 2010 09:59:39 +0400
+Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
+ systems
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+
+--- otp_src_18.0-orig/lib/os_mon/doc/src/Makefile
++++ otp_src_18.0-fixed/lib/os_mon/doc/src/Makefile
+@@ -36,12 +36,17 @@
+ # Target Specs
+ # ----------------------------------------------------
+ XML_APPLICATION_FILES = ref_man.xml
++ifeq ($(findstring win32,$(TARGET)),win32)
++NTEVENTLOG_DOCFILE=nteventlog.xml
++else
++NTEVENTLOG_DOCFILE=
++endif
+ XML_REF3_FILES = cpu_sup.xml \
+ 	disksup.xml \
+ 	memsup.xml \
+ 	os_mon_mib.xml \
+ 	os_sup.xml \
+-	nteventlog.xml
++	$(NTEVENTLOG_DOCFILE)
+ 
+ XML_REF6_FILES = os_mon_app.xml 
+ 
+--- otp_src_18.0-orig/lib/os_mon/src/Makefile
++++ otp_src_18.0-fixed/lib/os_mon/src/Makefile
+@@ -34,8 +34,13 @@
+ # ----------------------------------------------------
+ # Target Specs
+ # ----------------------------------------------------
++ifeq ($(findstring win32,$(TARGET)),win32)
++NTEVENTLOG=nteventlog
++else
++NTEVENTLOG=
++endif
+ MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
+-	nteventlog
++	 $(NTEVENTLOG)
+ 
+ INCLUDE=../include
+ CSRC=../c_src
+@@ -79,7 +84,11 @@
+ # ----------------------------------------------------
+ 
+ $(APP_TARGET): $(APP_SRC) ../vsn.mk
++ifeq ($(findstring win32,$(TARGET)),win32)
+ 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
++else
++	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@
++endif
+ 
+ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
diff --git a/testing/erlang/0006-Do-not-install-erlang-sources.patch b/testing/erlang/0006-Do-not-install-erlang-sources.patch
new file mode 100644
index 0000000..8d14da5
--- /dev/null
+++ b/testing/erlang/0006-Do-not-install-erlang-sources.patch
@@ -0,0 +1,858 @@
+From: Hans Ulrich Niedermann <[email-masked]>
+Date: Mon, 21 Mar 2011 15:41:49 +0100
+Subject: [PATCH] Do not install erlang sources
+
+Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+Signed-off-by: Hans Ulrich Niedermann <[email-masked]>
+
+--- otp_src_18.0-orig/erts/preloaded/src/Makefile
++++ otp_src_18.0-fixed/erts/preloaded/src/Makefile
+@@ -86,8 +86,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: $(APP_TARGET)
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/asn1/src/Makefile
++++ otp_src_18.0-fixed/lib/asn1/src/Makefile
+@@ -155,7 +155,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
+ 
+--- otp_src_18.0-orig/lib/common_test/src/Makefile
++++ otp_src_18.0-fixed/lib/common_test/src/Makefile
+@@ -144,7 +144,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/compiler/src/Makefile
++++ otp_src_18.0-fixed/lib/compiler/src/Makefile
+@@ -172,8 +172,8 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
+-		$(YRL_FILE) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
++		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/cosEvent/src/Makefile
++++ otp_src_18.0-fixed/lib/cosEvent/src/Makefile
+@@ -203,7 +203,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/cosEventDomain/src/Makefile
++++ otp_src_18.0-fixed/lib/cosEventDomain/src/Makefile
+@@ -172,7 +172,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/cosFileTransfer/src/Makefile
++++ otp_src_18.0-fixed/lib/cosFileTransfer/src/Makefile
+@@ -180,9 +180,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+ release_docs_spec:
+--- otp_src_18.0-orig/lib/cosNotification/src/Makefile
++++ otp_src_18.0-fixed/lib/cosNotification/src/Makefile
+@@ -371,8 +371,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/cosProperty/src/Makefile
++++ otp_src_18.0-fixed/lib/cosProperty/src/Makefile
+@@ -180,8 +180,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/cosTime/src/Makefile
++++ otp_src_18.0-fixed/lib/cosTime/src/Makefile
+@@ -199,8 +199,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/cosTransactions/src/Makefile
++++ otp_src_18.0-fixed/lib/cosTransactions/src/Makefile
+@@ -174,7 +174,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/crypto/src/Makefile
++++ otp_src_18.0-fixed/lib/crypto/src/Makefile
+@@ -82,8 +82,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
+ 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/debugger/src/Makefile
++++ otp_src_18.0-fixed/lib/debugger/src/Makefile
+@@ -117,7 +117,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/dialyzer/src/Makefile
++++ otp_src_18.0-fixed/lib/dialyzer/src/Makefile
+@@ -152,7 +152,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
++	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
+ 		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/diameter/src/Makefile
++++ otp_src_18.0-fixed/lib/diameter/src/Makefile
+@@ -251,11 +251,8 @@
+ 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
+ 
+ $(TARGET_DIRS:%/=release_src_%): release_src_%:
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
+-	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
+-	                               $(INTERNAL_HRLS)) \
+-	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
+-	                "$(RELSYSDIR)/src/$*"
++	$(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \
++	                "$(RELSYSDIR)/src/$*" || true
+ 
+ $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
+--- otp_src_18.0-orig/lib/edoc/src/Makefile
++++ otp_src_18.0-fixed/lib/edoc/src/Makefile
+@@ -88,7 +88,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 
+ release_docs_spec:
+ 
+--- otp_src_18.0-orig/lib/eldap/src/Makefile
++++ otp_src_18.0-fixed/lib/eldap/src/Makefile
+@@ -99,10 +99,6 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
+-	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/erl_docgen/src/Makefile
++++ otp_src_18.0-fixed/lib/erl_docgen/src/Makefile
+@@ -90,8 +90,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/et/src/Makefile
++++ otp_src_18.0-fixed/lib/et/src/Makefile
+@@ -109,7 +109,6 @@
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/eunit/src/Makefile
++++ otp_src_18.0-fixed/lib/eunit/src/Makefile
+@@ -120,7 +120,6 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/gs/src/Makefile
++++ otp_src_18.0-fixed/lib/gs/src/Makefile
+@@ -109,8 +109,8 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
+-		$(GSTK_GENERIC) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \
++		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
+--- otp_src_18.0-orig/lib/hipe/cerl/Makefile
++++ otp_src_18.0-fixed/lib/hipe/cerl/Makefile
+@@ -102,7 +102,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/cerl"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/hipe/flow/Makefile
++++ otp_src_18.0-fixed/lib/hipe/flow/Makefile
+@@ -102,7 +102,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/flow"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
++	$(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/hipe/icode/Makefile
++++ otp_src_18.0-fixed/lib/hipe/icode/Makefile
+@@ -120,7 +120,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/icode"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/hipe/llvm/Makefile
++++ otp_src_18.0-fixed/lib/hipe/llvm/Makefile
+@@ -103,7 +103,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) $(RELSYSDIR)/llvm
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm
++	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm
+ 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 
+--- otp_src_18.0-orig/lib/hipe/main/Makefile
++++ otp_src_18.0-fixed/lib/hipe/main/Makefile
+@@ -118,7 +118,7 @@
+ release_spec: opt
+ 	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/main"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/hipe/misc/Makefile
++++ otp_src_18.0-fixed/lib/hipe/misc/Makefile
+@@ -102,7 +102,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/misc"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/hipe/rtl/Makefile
++++ otp_src_18.0-fixed/lib/hipe/rtl/Makefile
+@@ -105,7 +105,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/rtl"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/hipe/util/Makefile
++++ otp_src_18.0-fixed/lib/hipe/util/Makefile
+@@ -50,7 +50,6 @@
+ endif
+ MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES)
+ 
+-HRL_FILES=
+ ERL_FILES= $(MODULES:%=%.erl)
+ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
+@@ -104,8 +103,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/util"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/ic/src/Makefile
++++ otp_src_18.0-fixed/lib/ic/src/Makefile
+@@ -200,7 +200,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
+ 	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
+--- otp_src_18.0-orig/lib/inets/src/ftp/Makefile
++++ otp_src_18.0-fixed/lib/inets/src/ftp/Makefile
+@@ -91,7 +91,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/inets/src/http_client/Makefile
++++ otp_src_18.0-fixed/lib/inets/src/http_client/Makefile
+@@ -92,7 +92,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_client"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/inets/src/http_lib/Makefile
++++ otp_src_18.0-fixed/lib/inets/src/http_lib/Makefile
+@@ -90,7 +90,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_lib"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/inets/src/http_server/Makefile
++++ otp_src_18.0-fixed/lib/inets/src/http_server/Makefile
+@@ -127,7 +127,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/inets/src/inets_app/Makefile
++++ otp_src_18.0-fixed/lib/inets/src/inets_app/Makefile
+@@ -116,7 +116,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/inets/src/tftp/Makefile
++++ otp_src_18.0-fixed/lib/inets/src/tftp/Makefile
+@@ -96,7 +96,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/kernel/src/Makefile
++++ otp_src_18.0-fixed/lib/kernel/src/Makefile
+@@ -200,7 +200,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/megaco/src/app/Makefile
++++ otp_src_18.0-fixed/lib/megaco/src/app/Makefile
+@@ -114,7 +114,7 @@
+ 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/app"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/megaco/src/binary/Makefile
++++ otp_src_18.0-fixed/lib/megaco/src/binary/Makefile
+@@ -176,7 +176,7 @@
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/binary"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary"
+ 
+ 
+ release_docs_spec:
+--- otp_src_18.0-orig/lib/megaco/src/engine/Makefile
++++ otp_src_18.0-fixed/lib/megaco/src/engine/Makefile
+@@ -102,7 +102,7 @@
+ 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/engine"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+ 
+ 
+--- otp_src_18.0-orig/lib/megaco/src/flex/Makefile.in
++++ otp_src_18.0-fixed/lib/megaco/src/flex/Makefile.in
+@@ -268,8 +268,6 @@
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
+-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
+ 	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
+ 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+--- otp_src_18.0-orig/lib/megaco/src/tcp/Makefile
++++ otp_src_18.0-fixed/lib/megaco/src/tcp/Makefile
+@@ -94,7 +94,7 @@
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tcp"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
+ 
+ 
+ release_docs_spec:
+--- otp_src_18.0-orig/lib/megaco/src/text/Makefile
++++ otp_src_18.0-fixed/lib/megaco/src/text/Makefile
+@@ -135,7 +135,7 @@
+ 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/text"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
+ 
+ 
+ release_docs_spec:
+--- otp_src_18.0-orig/lib/megaco/src/udp/Makefile
++++ otp_src_18.0-fixed/lib/megaco/src/udp/Makefile
+@@ -94,7 +94,7 @@
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/udp"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
+ 
+ 
+ release_docs_spec:
+--- otp_src_18.0-orig/lib/mnesia/src/Makefile
++++ otp_src_18.0-fixed/lib/mnesia/src/Makefile
+@@ -133,7 +133,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/observer/src/Makefile
++++ otp_src_18.0-fixed/lib/observer/src/Makefile
+@@ -152,7 +152,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
+--- otp_src_18.0-orig/lib/odbc/src/Makefile
++++ otp_src_18.0-fixed/lib/odbc/src/Makefile
+@@ -110,7 +110,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/orber/COSS/CosNaming/Makefile
++++ otp_src_18.0-fixed/lib/orber/COSS/CosNaming/Makefile
+@@ -145,8 +145,8 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+-	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
++	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
++	$(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming"
+ 
+ 
+ release_docs_spec:
+--- otp_src_18.0-orig/lib/orber/src/Makefile
++++ otp_src_18.0-fixed/lib/orber/src/Makefile
+@@ -253,7 +253,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/os_mon/src/Makefile
++++ otp_src_18.0-fixed/lib/os_mon/src/Makefile
+@@ -105,7 +105,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/ose/src/Makefile
++++ otp_src_18.0-fixed/lib/ose/src/Makefile
+@@ -94,9 +94,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/otp_mibs/src/Makefile
++++ otp_src_18.0-fixed/lib/otp_mibs/src/Makefile
+@@ -96,8 +96,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/parsetools/src/Makefile
++++ otp_src_18.0-fixed/lib/parsetools/src/Makefile
+@@ -91,8 +91,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/percept/src/Makefile
++++ otp_src_18.0-fixed/lib/percept/src/Makefile
+@@ -97,7 +97,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ #	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ #	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/public_key/asn1/Makefile
++++ otp_src_18.0-fixed/lib/public_key/asn1/Makefile
+@@ -96,8 +96,8 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
+-	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \
+-		 $(GEN_ERLS) "$(RELSYSDIR)/asn1"
++	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \
++		 "$(RELSYSDIR)/asn1"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/public_key/src/Makefile
++++ otp_src_18.0-fixed/lib/public_key/src/Makefile
+@@ -50,8 +50,6 @@
+ 
+ HRL_FILES = $(INCLUDE)/public_key.hrl 
+ 
+-INTERNAL_HRL_FILES = 
+-
+ ERL_FILES = $(MODULES:%=%.erl)
+ 
+ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+@@ -104,8 +102,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/reltool/src/Makefile
++++ otp_src_18.0-fixed/lib/reltool/src/Makefile
+@@ -100,7 +100,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/runtime_tools/src/Makefile
++++ otp_src_18.0-fixed/lib/runtime_tools/src/Makefile
+@@ -97,8 +97,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+--- otp_src_18.0-orig/lib/sasl/src/Makefile
++++ otp_src_18.0-fixed/lib/sasl/src/Makefile
+@@ -93,7 +93,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/snmp/src/agent/Makefile
++++ otp_src_18.0-fixed/lib/snmp/src/agent/Makefile
+@@ -131,7 +131,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ 		"$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/snmp/src/app/Makefile
++++ otp_src_18.0-fixed/lib/snmp/src/app/Makefile
+@@ -132,7 +132,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ 		"$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/snmp/src/compile/Makefile
++++ otp_src_18.0-fixed/lib/snmp/src/compile/Makefile
+@@ -123,7 +123,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
+-	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+--- otp_src_18.0-orig/lib/snmp/src/manager/Makefile
++++ otp_src_18.0-fixed/lib/snmp/src/manager/Makefile
+@@ -114,7 +114,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/manager"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/snmp/src/misc/Makefile
++++ otp_src_18.0-fixed/lib/snmp/src/misc/Makefile
+@@ -112,7 +112,7 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/ssh/src/Makefile
++++ otp_src_18.0-fixed/lib/ssh/src/Makefile
+@@ -136,7 +136,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+ 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/ssl/src/Makefile
++++ otp_src_18.0-fixed/lib/ssl/src/Makefile
+@@ -141,7 +141,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+ 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/stdlib/src/Makefile
++++ otp_src_18.0-fixed/lib/stdlib/src/Makefile
+@@ -207,7 +207,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/syntax_tools/src/Makefile
++++ otp_src_18.0-fixed/lib/syntax_tools/src/Makefile
+@@ -100,8 +100,6 @@
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
+ 
+--- otp_src_18.0-orig/lib/test_server/src/Makefile
++++ otp_src_18.0-fixed/lib/test_server/src/Makefile
+@@ -124,7 +124,6 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+--- otp_src_18.0-orig/lib/tools/src/Makefile
++++ otp_src_18.0-fixed/lib/tools/src/Makefile
+@@ -107,7 +107,7 @@
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ 		"$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/typer/src/Makefile
++++ otp_src_18.0-fixed/lib/typer/src/Makefile
+@@ -102,9 +102,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \
+-		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
+ 
+--- otp_src_18.0-orig/lib/webtool/src/Makefile
++++ otp_src_18.0-fixed/lib/webtool/src/Makefile
+@@ -88,8 +88,6 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ 		"$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/wx/src/Makefile
++++ otp_src_18.0-fixed/lib/wx/src/Makefile
+@@ -122,9 +122,9 @@
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt 
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src/gen"
+-	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen"
++	$(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+--- otp_src_18.0-orig/lib/xmerl/src/Makefile
++++ otp_src_18.0-fixed/lib/xmerl/src/Makefile
+@@ -218,9 +218,7 @@
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+ 
diff --git a/testing/erlang/0007-Split-off-webtool-dependency-from-tools.patch b/testing/erlang/0007-Split-off-webtool-dependency-from-tools.patch
new file mode 100644
index 0000000..6a58f5c
--- /dev/null
+++ b/testing/erlang/0007-Split-off-webtool-dependency-from-tools.patch
@@ -0,0 +1,38 @@
+From: Peter Lemenkov <[email-masked]>
+Date: Sat, 8 Nov 2014 22:54:57 +0300
+Subject: [PATCH] Split off webtool dependency from tools
+
+Signed-off-by: Peter Lemenkov <[email-masked]>
+
+--- otp_src_18.0-orig/lib/tools/src/cover_web.erl
++++ otp_src_18.0-fixed/lib/tools/src/cover_web.erl
+@@ -51,14 +51,25 @@
+ %%%----------------------------------------------------------------------
+ %% Start webtool and webcover from erlang shell
+ start() ->
+-    webtool:start(),
+-    webtool:start_tools([],"app=webcover"),
++    try
++        % Disable automatic dependency picking up
++        erlang:apply(webtool, start, []),
++        erlang:apply(webtool, start_tools, [[],"app=webcover"])
++    catch
++        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
++    end,
+     ok.
+ 
+ %% Stop webtool and webcover from erlang shell
+ stop() ->
+-    webtool:stop_tools([],"app=webcover"),
+-    webtool:stop().
++    try
++        % Disable automatic dependency picking up
++        erlang:apply(webtool, stop_tools, [[],"app=webcover"]),
++        erlang:apply(webtool, stop, [])
++    catch
++        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
++    end,
++    ok.
+ 
+ 
+ 
diff --git a/testing/erlang/0010-fix-nteventlog-remove.patch b/testing/erlang/0010-fix-nteventlog-remove.patch
new file mode 100644
index 0000000..ed49b3a
--- /dev/null
+++ b/testing/erlang/0010-fix-nteventlog-remove.patch
@@ -0,0 +1,11 @@
+--- otp_src_18.0-orig/lib/os_mon/ebin/os_mon.app
++++ otp_src_18.0-fixed/lib/os_mon/ebin/os_mon.app
+@@ -22,7 +22,7 @@
+    [{description, "CPO  CXC 138 46"},
+     {vsn, "2.4"},
+     {modules, [os_mon, os_mon_mib, os_sup,
+-               disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
++               disksup, memsup, cpu_sup, os_mon_sysinfo]},
+     {registered, [os_mon_sup, os_mon_sysinfo, disksup, memsup, cpu_sup, 
+                   os_sup_server]},
+     {applications, [kernel, stdlib, sasl]},
diff --git a/testing/erlang/0020-remove-private-unit32.patch b/testing/erlang/0020-remove-private-unit32.patch
new file mode 100644
index 0000000..ec01499
--- /dev/null
+++ b/testing/erlang/0020-remove-private-unit32.patch
@@ -0,0 +1,11 @@
+--- otp_src_18.0-orig/erts/emulator/sys/common/erl_poll.h
++++ otp_src_18.0-fixed/erts/emulator/sys/common/erl_poll.h
+@@ -140,7 +140,7 @@
+ #endif
+ 
+ #define ERTS_POLL_EV_E2N(EV) \
+-  ((__uint32_t) (EV))
++  ((uint32_t) (EV))
+ #define ERTS_POLL_EV_N2E(EV) \
+   ((ErtsPollEvents) (EV))
+ 
diff --git a/testing/erlang/0030-replace_glibc_check.patch b/testing/erlang/0030-replace_glibc_check.patch
new file mode 100644
index 0000000..5ae9804
--- /dev/null
+++ b/testing/erlang/0030-replace_glibc_check.patch
@@ -0,0 +1,20 @@
+--- otp_src_18.0-orig/lib/erl_interface/src/connect/ei_resolve.c
++++ otp_src_18.0-fixed/lib/erl_interface/src/connect/ei_resolve.c
+@@ -616,7 +616,7 @@
+ #ifndef HAVE_GETHOSTBYNAME_R
+   return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop);
+ #else
+-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
++#if (defined(_BSD_SOURCE) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
+   struct hostent *result;
+ 
+   gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result,
+@@ -643,7 +643,7 @@
+ #ifndef HAVE_GETHOSTBYNAME_R
+   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
+ #else
+-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
++#if (defined(_BSD_SOURCE) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
+   struct hostent *result;
+ 
+   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
diff --git a/testing/erlang/0040-otp-update-version-18.0.1.patch b/testing/erlang/0040-otp-update-version-18.0.1.patch
new file mode 100644
index 0000000..b35daab
--- /dev/null
+++ b/testing/erlang/0040-otp-update-version-18.0.1.patch
@@ -0,0 +1,86 @@
+--- a/OTP_VERSION
++++ b/OTP_VERSION
+@@ -1 +1 @@
+-18.0
++18.0.1
+--- a/erts/doc/src/notes.xml
++++ b/erts/doc/src/notes.xml
+@@ -31,6 +31,22 @@
+   </header>
+   <p>This document describes the changes made to the ERTS application.</p>
+ 
++<section><title>Erts 7.0.1</title>
++
++    <section><title>Fixed Bugs and Malfunctions</title>
++      <list>
++        <item>
++          <p>
++	    Fix a rare hanging of the VM seen to happen just after
++	    emulator start. Bug exists since R14.</p>
++          <p>
++	    Own Id: OTP-12859 Aux Id: seq12882 </p>
++        </item>
++      </list>
++    </section>
++
++</section>
++
+ <section><title>Erts 7.0</title>
+ 
+     <section><title>Fixed Bugs and Malfunctions</title>
+--- a/erts/emulator/sys/common/erl_poll.c
++++ b/erts/emulator/sys/common/erl_poll.c
+@@ -431,7 +431,7 @@ static ERTS_INLINE int
+ is_interrupted_reset(ErtsPollSet ps)
+ {
+ #if defined(USE_THREADS) || ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+-    return (erts_atomic32_xchg_nob(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN)
++    return (erts_atomic32_xchg_acqb(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN)
+ 	    == ERTS_POLL_WOKEN_INTR);
+ #else
+     return 0;
+@@ -442,7 +442,7 @@ static ERTS_INLINE void
+ woke_up(ErtsPollSet ps)
+ {
+ #if defined(USE_THREADS) || ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+-    erts_aint32_t wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
++    erts_aint32_t wakeup_state = erts_atomic32_read_acqb(&ps->wakeup_state);
+     if (wakeup_state == ERTS_POLL_NOT_WOKEN)
+ 	(void) erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
+ 					 ERTS_POLL_WOKEN,
+@@ -469,14 +469,9 @@ wake_poller(ErtsPollSet ps, int interrupted, int async_signal_safe)
+ 	    wakeup_state = erts_atomic32_cmpxchg_relb(&ps->wakeup_state,
+ 						      ERTS_POLL_WOKEN,
+ 						      ERTS_POLL_NOT_WOKEN);
+-	else {
+-	    /*
+-	     * We might unnecessarily write to the pipe, however,
+-	     * that isn't problematic.
+-	     */
+-	    wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
+-	    erts_atomic32_set_relb(&ps->wakeup_state, ERTS_POLL_WOKEN_INTR);
+-	}
++	else
++            wakeup_state = erts_atomic32_xchg_relb(&ps->wakeup_state,
++                                                   ERTS_POLL_WOKEN_INTR);
+ 	wake = wakeup_state == ERTS_POLL_NOT_WOKEN;
+     }
+     /*
+--- a/erts/vsn.mk
++++ b/erts/vsn.mk
+@@ -18,7 +18,7 @@
+ # %CopyrightEnd%
+ # 
+ 
+-VSN = 7.0
++VSN = 7.0.1
+ 
+ # Port number 4365 in 4.2
+ # Port number 4366 in 4.3
+--- a/otp_versions.table
++++ b/otp_versions.table
+@@ -1,3 +1,4 @@
++OTP-18.0.1 : erts-7.0.1 # asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 runtime_tools-1.9 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 :
+ OTP-18.0 : asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 erts-7.0 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 runtime_tools-1.9 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 # :
+ OTP-17.5.6 : inets-5.10.9 ssh-3.2.4 ssl-6.0.1 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 diameter-1.9.2 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.2 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
+ OTP-17.5.5 : diameter-1.9.2 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.8 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.2 ssh-3.2.3 ssl-6.0 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
diff --git a/testing/erlang/APKBUILD b/testing/erlang/APKBUILD
index 87de3b7..2d4f2bd 100644
--- a/testing/erlang/APKBUILD
+++ b/testing/erlang/APKBUILD
@@ -2,11 +2,12 @@
 # Maintainer: Marlus Saraiva <[email-masked]>
 
 pkgname=erlang
-pkgver=17.5
-pkgrel=1
+pkgver=18.0.1
+_srcver=18.0
+pkgrel=0
 pkgdesc="General-purpose programming language and runtime environment"
 url="http://www.erlang.org/"
-license="ERPL"
+license="ASL 2.0"
 arch="all"
 depends="$pkgname-kernel $pkgname-stdlib $pkgname-compiler"
 makedepends="perl-dev zlib-dev ncurses-dev openssl-dev openjdk7 unixodbc-dev"
@@ -63,21 +64,21 @@ subpackages="$pkgname-dev
 	     $pkgname-typer:typer
 	     $pkgname-webtool:webtool
 	     $pkgname-xmerl:xmerl"
-# Patches 0001-0009 found: http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=tree
-source="http://www.erlang.org/download/otp_src_$pkgver.tar.gz
-        otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
-        otp-0002-Remove-rpath.patch
-        otp-0003-Do-not-install-C-sources.patch
-        otp-0004-Do-not-install-Java-sources.patch
-        otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-        otp-0006-Do-not-install-erlang-sources.patch
-        otp-0007-Split-off-webtool-dependency-from-tools.patch
-        otp-0008-Introduce-os-getenv-2.patch
-        otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
-        remove-private-unit32.patch
-	replace_glibc_check.patch"
+# Patches 0001-0007 found: http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=tree
+source="http://www.erlang.org/download/otp_src_$_srcver.tar.gz
+        0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+        0002-Remove-rpath.patch
+        0003-Do-not-install-C-sources.patch
+        0004-Do-not-install-Java-sources.patch
+        0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+        0006-Do-not-install-erlang-sources.patch
+        0007-Split-off-webtool-dependency-from-tools.patch
+        0010-fix-nteventlog-remove.patch
+        0020-remove-private-unit32.patch
+        0030-replace_glibc_check.patch
+        0040-otp-update-version-18.0.1.patch"
 
-_builddir="$srcdir"/otp_src_$pkgver
+_builddir="$srcdir"/otp_src_$_srcver
 
 prepare() {
 	local i
@@ -207,39 +208,39 @@ dev() {
 }

-md5sums="346dd0136bf1cc28cebc140e505206bb  otp_src_17.5.tar.gz
-5eb1ff3dd4ccf1a2a9e038ca599d535c  otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
-6202359c7326ad45da303dea5b865ed7  otp-0002-Remove-rpath.patch
-49e76b9d1356c432141cc9e472ece48f  otp-0003-Do-not-install-C-sources.patch
-b16edcf58468e7f33da182ba622d9372  otp-0004-Do-not-install-Java-sources.patch
-7e28da985292a2eec4ca24ae582afe89  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-df2f5d70293bce953d94cb4ae76bb3a8  otp-0006-Do-not-install-erlang-sources.patch
-df323f3ed63e1112826ddc8012cae9d8  otp-0007-Split-off-webtool-dependency-from-tools.patch
-4689e0e5fd9040a86433d36e23020a6e  otp-0008-Introduce-os-getenv-2.patch
-316027d711101e06258d0d85de30e3b0  otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
-20b48b781961fbff5dfc81df383c12e0  remove-private-unit32.patch
-06b7d939d3a18839d1c696998085c9c0  replace_glibc_check.patch"
-sha256sums="3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474  otp_src_17.5.tar.gz
-18b235111ab59e89f6257ffa2b6a0c48933fda3107c9a4e6f15b718d080c5f37  otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
-f431800227050a8665c958ed9f21738adb7bbab5cbadb863eeb282f3da193a33  otp-0002-Remove-rpath.patch
-b4b2cfd436b9e75ea998784cce40492aa41512417321332e5b315361e80383d8  otp-0003-Do-not-install-C-sources.patch
-94380dab56a7687f6646b8e0b9e6433086ba36efd568ca41a7059312c3b9b5b1  otp-0004-Do-not-install-Java-sources.patch
-a091577926bd30204e43b5e1350b9c4dfd8adc6728075d62a1b888a3b7dac196  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-ff3600d52418ac5d70161955d6cebd2d6ce0fd93700afdc1834df29fc437a705  otp-0006-Do-not-install-erlang-sources.patch
-b15610e9cc879467e2387db1eef450827bc58bf4cbc9ffd5d40272ba6b76c8d2  otp-0007-Split-off-webtool-dependency-from-tools.patch
-0dca75b3fc682b03d3ed736100ef4589bd7fcc28af53325a1d36c46a2a56330e  otp-0008-Introduce-os-getenv-2.patch
-450b48773c767b01ce78e91d4d54a74f9fa2d093729c82278c0defb14723529d  otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
-c593c4715a31054031174fcc1a52d562440534e22762f7c19a76e0abedeef9c7  remove-private-unit32.patch
-37c762d495d252b69266b6ef59ae83d52ae9544c3a93845ca1f8225507f48249  replace_glibc_check.patch"
-sha512sums="cfd082c8baee7ded370a34f15a1ba3b846b7d81e06edc36c62308c9220697925f1feda91eeecb70fc658f8987087256f51a2ebd0c526d16eeb09c72889d2390d  otp_src_17.5.tar.gz
-2fa0a9259432df4af3e10aacdbc8a782d11f86f4f06f6ff3299c698177744a26caaab248b8b00d89c99eb9a41ba9530037c5852dde73add58cb253e64de60258  otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
-2111ce99ecc59e44d707b92d3f10b109e326f2e5f68d342c2b0e20089dcd43c45bae1eeda48f9a2d7e655696dd707fb99a6ca3936302813a0dfbdad098edc48d  otp-0002-Remove-rpath.patch
-076cf7e08cfdf015170abfe936f62c98bbb9a743235eabfd29362b79c95f1bcdde7ddfb1c4a46503765e53a13b1aeaaa433ea4f51ca1721057bb90a8977a873b  otp-0003-Do-not-install-C-sources.patch
-5a89290eaaf622192f7ef32e70f8a1301581afa5541902aa961c0c4431183d9822668daa1d48bfc2dee010ab747b0c1f4511525a243be42c8cff252bdd7906f7  otp-0004-Do-not-install-Java-sources.patch
-dbc1f484060056609811aec51d611ffed89bbb234949088aadf94ec017f3d1dce95144ab6d38b6da709d14615825f6d3ec63e61b3b00cb95086d7d23070b3c0c  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-ec0c06c8e219458f9fc624a98360a302d3facbb3f0ae4eaefabac04789d0019a493287956682d70f99d64134a7fe2dbaf86f74a28afdf2264d36893085260d88  otp-0006-Do-not-install-erlang-sources.patch
-de19924f6aa652a93481a16f89f6eff4181f76a776f8a3ebd0c9a5b2f6344b8d3d4c2bb6192a5ef542d2dd02095d9bb9a2f094c248c01446daeb5abed2d471fe  otp-0007-Split-off-webtool-dependency-from-tools.patch
-52c3cadd0ee294c209dc031623c415334a1946b9f77ed1acfb7c9e9e1b1d2a0186b7996098ea53d0cdfb4fc3d0c4a53587af0df1887040c4aafa9aad4cb74488  otp-0008-Introduce-os-getenv-2.patch
-c4465ee5369d066a258e4cd06267a57150e8701f23530ce246bc8bb91d1a141f613f97a2a438a19b3e39aaab815f3e78eb64cf7f31d0404fb03b288db826a6d9  otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
-0f5b2899de78c5481b38250583a1ef8825aec2ac74eaecf35a6ad3d1165ba6422dca6206d349d5a6f61d7fdb26dac688c2dbe13632cf23b671913af674593764  remove-private-unit32.patch
-8dc50e4d89173142b6b795bf802c991a1442648f934f623c2a6ddd1ebd075d8dc30d0ec584584cd8f36e8d22e947b9a1062c70e79c14090530c7a1ad678b9eca  replace_glibc_check.patch"
+md5sums="232acb0c278ee05c8d787cbaf6399be5  otp_src_18.0.tar.gz
+11d2bfea3dd3138409337d62f2348ff2  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+ef4b726309a749010553259080960753  0002-Remove-rpath.patch
+458118f96fb0c973a30630c070bd94aa  0003-Do-not-install-C-sources.patch
+1c3b158ac8408fced9a0f3630f4498f1  0004-Do-not-install-Java-sources.patch
+f4aa0cc27dc57ea4dcd57191b1948a4d  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+37861f7e1e02993018d6751d0d7bb83c  0006-Do-not-install-erlang-sources.patch
+b438c37818b5c82443682c3693dd7e53  0007-Split-off-webtool-dependency-from-tools.patch
+fcb02f2cc2050789aa85f6f0084836c3  0010-fix-nteventlog-remove.patch
+062605d7f01f4685f1897ba2decc23a8  0020-remove-private-unit32.patch
+7a5c956b7bf79e34a0f980d1e2a65bee  0030-replace_glibc_check.patch
+e621bd76d8e19af2d60e4d1a11ddbca3  0040-otp-update-version-18.0.1.patch"
+sha256sums="a0b69da34b4f218eb7d63d9e96fc120aa7257bb6c37a0f40fb388e188b4111aa  otp_src_18.0.tar.gz
+536e78192f915733cbbb264883af6d9b11c9e70c2c4d3d825b58c4dbec36db86  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+b2e5844215d7f5f5026a77342dd698d16103cc726d23f8265bcc8399d1a82bb9  0002-Remove-rpath.patch
+81062f0eb9a72cbfac600fab56823161f92e1e5107b359f27f9f0ec511b8aec5  0003-Do-not-install-C-sources.patch
+2ed61274decb534ab4142bd0a2116a75e3fe82d33a8ff145524173ce5773b0e2  0004-Do-not-install-Java-sources.patch
+71c8a55fe036d5a04ba2c008b51d8950c3f18d83edaffb9bef2a9d19dd2f79f3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+b810ef25504fbce3f9a0d4ae1e02fc4225b01fd68daa88566f6f8de37e26b351  0006-Do-not-install-erlang-sources.patch
+9704a53bc4bd6f5624f9ce3f201128204011f4579f19b547df74d92ae22777cf  0007-Split-off-webtool-dependency-from-tools.patch
+70dd9d1c4914ccecdbb3623ee23eb9ae3c8df8a5e40e2e0177c754440afe55f9  0010-fix-nteventlog-remove.patch
+0b63ff5ce4e642d4225d5cc4d52d88dd5daf83ce5a2549ba0e5a14ce05e17ac2  0020-remove-private-unit32.patch
+e3158dbb4bcb4677ceda39a374326c069de78a52e598ef8169a288b86a040a62  0030-replace_glibc_check.patch
+a014ad5c5da2512672af7a98ca072d6aa2615af2d1cc8e67a6cc611096cc922a  0040-otp-update-version-18.0.1.patch"
+sha512sums="84ec2a3834270c1babe153572d6187faa36c12128e604037d55be01719788c0dd79d46769ea7090d530b746206a25fe02346b02849abee10ee41ed4ac7567c02  otp_src_18.0.tar.gz
+172f9b0f61748bf2f04737df0451bcc9c0812db0f365f0ef7c7c244fceb991987f79a5274eea578a89cc7d077f84645d1395d9dbcbf14010268b896a080c2ccf  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+97c40c185b71b23ffcb924639af390b9a0be897070e396a9413e193e6d43048dfe3b86bcd0c5598b81a66ce1349de9e09f5228a452b51b6612cd947bbafb6377  0002-Remove-rpath.patch
+1cae89d1e8f9d375ae08c7de2b8f7a5143bcded90eef878e97c408542a50e9a880166311820013301e46364be0ae090d3fc515b6f915ead14e787b98290beec1  0003-Do-not-install-C-sources.patch
+b174e3c9103aa26e3b4993ae77b849a55f733e6f8e5dd7bb641a8548aea7fcc91b99d772c91ff8864fff5c30b388438f8cb41d7ac941a86fc7bb1891f9838068  0004-Do-not-install-Java-sources.patch
+923addcb1f6472829ba13ccc91ad3cef161f269478404f0a19bc4997118e06edd7459011a60769eb393eac930f30d4bd6c5526301382a5f9815862237f4664d3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+20a7200fe811b5256ef89bcbf19dd6ebb29c7c9109311f6d3adca2ade42c13ca63a28ff8f3e49308feaeda1e30a4e3a7e1083edf57b42219d0794dddc0f4a464  0006-Do-not-install-erlang-sources.patch
+d65fcfc3a9441941c6292c33d354964a82da11cc7a411dd0440719e490075ed588c1e70690e80650561749010d737394567f12ff73bd460f0d00c792c77cfae3  0007-Split-off-webtool-dependency-from-tools.patch
+ccd876c5e3e370a3cd85907240546be6be124f8b38e19fae1b152f6858ebd3f4f7421931a8e314dddf019ed9c75cc453c08633b20fa08c05810f66c92725a3ed  0010-fix-nteventlog-remove.patch
+18f70c3a99ac8c44bc9d90dc3f0c072ad4df4ffe57a8d0677087c9e940ba138d7a7698d5cdbbe14875a6012d353a679fdb33d40fca3a3211f712af8c4b0cb0b4  0020-remove-private-unit32.patch
+b554882bee1a70322cc8c5b973986047deaf4528fe1371df39cf72b27b2497a859463bdf8847ea6ea96cb0caaa6bd143c96a5dee28839164a547a66a30fcffd0  0030-replace_glibc_check.patch
+5f6f5856fc60f7bc333fb2736bcf0d8dd475658621bb8ded8a9f664bb045ba5b0768ec990a05e5c35c5dfaa284f10567ff61b7a3c521a907553561c50c068ad1  0040-otp-update-version-18.0.1.patch"
diff --git a/testing/erlang/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/testing/erlang/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
deleted file mode 100644
index 6aeadc8..0000000
--- a/testing/erlang/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Thu, 25 Feb 2010 16:45:28 +0300
-Subject: [PATCH] Do not format man-pages and do not install miscellaneous
- utilities for dealing with man-pages.
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 0cf965f..94e82a8 100644
---- a/erts/etc/common/Makefile.in
-+++ b/erts/etc/common/Makefile.in
-@@ -550,10 +550,6 @@ endif
- ifneq ($(INSTALL_TOP_BIN),)
- 	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
- endif
--ifneq ($(INSTALL_MISC),)
--	$(INSTALL_DIR) "$(RELEASE_PATH)/misc"
--	$(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc"
--endif
- ifneq ($(INSTALL_SRC),)
- 	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"
- 	$(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"
-diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
-index 8eb1db7..9e340bb 100644
---- a/erts/etc/unix/Install.src
-+++ b/erts/etc/unix/Install.src
-@@ -140,14 +140,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
- cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot .
- cp -p $Name.boot start.boot
- cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
--#
--# Fixing the man pages
--#
--
--if [ -d "$ERL_ROOT/man" ]
--then
--    cd "$ERL_ROOT"
--    ./misc/format_man_pages "$ERL_ROOT"
--fi
- 
- exit 0
diff --git a/testing/erlang/otp-0002-Remove-rpath.patch b/testing/erlang/otp-0002-Remove-rpath.patch
deleted file mode 100644
index 492734f..0000000
--- a/testing/erlang/otp-0002-Remove-rpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Thu, 25 Feb 2010 16:57:43 +0300
-Subject: [PATCH] Remove rpath
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 8c92b5b..5b36c19 100644
---- a/lib/crypto/c_src/Makefile.in
-+++ b/lib/crypto/c_src/Makefile.in
-@@ -89,7 +89,7 @@ endif
- DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
- 
- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
--SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
- CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
- EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
- else
-diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
-index 0989f14..0d29444 100644
---- a/lib/crypto/priv/Makefile
-+++ b/lib/crypto/priv/Makefile
-@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
- # ----------------------------------------------------
- 
- $(SO_NIFLIB): $(OBJS)
--	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
-+	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
- 	-o $@ $^ -lcrypto
- 
- $(DLL_NIFLIB): $(OBJS)
diff --git a/testing/erlang/otp-0003-Do-not-install-C-sources.patch b/testing/erlang/otp-0003-Do-not-install-C-sources.patch
deleted file mode 100644
index f89bcb7..0000000
--- a/testing/erlang/otp-0003-Do-not-install-C-sources.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Fri, 18 Jun 2010 23:41:33 +0400
-Subject: [PATCH] Do not install C sources
-
-Don't install *.c and *.o files.
-
-Excepts ones from the internal erl_interface. These
-API headers are necessary. See rhbz #818419 for the
-explanation why they're necessary for the low-level
-interaction with the Erlang nodes:
-
-https://bugzilla.redhat.com/818419
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index a7cd03f..6da4d75 100644
---- a/lib/asn1/c_src/Makefile
-+++ b/lib/asn1/c_src/Makefile
-@@ -142,8 +142,6 @@ release_spec: opt
- ifneq ($(findstring ose,$(TARGET)),ose)
- 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
- endif
--	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
--	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
- 
- release_docs_spec:
- 
-diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 5b36c19..470821e 100644
---- a/lib/crypto/c_src/Makefile.in
-+++ b/lib/crypto/c_src/Makefile.in
-@@ -199,14 +199,10 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
--	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
- ifneq ($(findstring ose,$(TARGET)),ose)
--	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
--	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
- endif
- endif
-diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index 7c09b60..2c14f9e 100644
---- a/lib/erl_interface/src/Makefile.in
-+++ b/lib/erl_interface/src/Makefile.in
-@@ -904,14 +904,14 @@ ifneq ($(EXE_TARGETS),)
- 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
- endif
- 	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
--	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
--	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
--	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
--	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
--	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
--	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
--	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
-+	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"
-+	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"
-+	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"
-+	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"
-+	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"
-+	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
-+	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"
-+	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"
- 
- release_docs:
- 
-diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
-index ed860ab..96206ae 100644
---- a/lib/ic/c_src/Makefile.in
-+++ b/lib/ic/c_src/Makefile.in
-@@ -144,12 +144,10 @@ $(OBJDIR)/%.o: %.c
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
- 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
- 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
--	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
- 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
- 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
-diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 6111cf2..bd62e8b 100644
---- a/lib/megaco/src/flex/Makefile.in
-+++ b/lib/megaco/src/flex/Makefile.in
-@@ -270,7 +270,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
--	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
-+	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
- endif
- 
-diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index 6572d28..c7093ae 100644
---- a/lib/odbc/c_src/Makefile.in
-+++ b/lib/odbc/c_src/Makefile.in
-@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- ifdef EXE_TARGET
--	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
--	$(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
--	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"
- endif
- 
-diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index f84ccf7..05d194f 100644
---- a/lib/os_mon/c_src/Makefile.in
-+++ b/lib/os_mon/c_src/Makefile.in
-@@ -125,8 +125,6 @@ $(OBJDIR)/memsup.o: memsup.h
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
- 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
- 
-diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
-index d46b499..4309aae 100644
---- a/lib/runtime_tools/c_src/Makefile.in
-+++ b/lib/runtime_tools/c_src/Makefile.in
-@@ -156,10 +156,8 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
- ifneq ($(findstring ose,$(TARGET)),ose)
--	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
- endif
- 
-diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index b1eb69f..1acfdbf 100644
---- a/lib/tools/c_src/Makefile.in
-+++ b/lib/tools/c_src/Makefile.in
-@@ -197,8 +197,6 @@ include ../vsn.mk
- RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
- 
- release_spec: all
--	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
--	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
- ifneq ($(PROGS),)
- 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
- 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"
diff --git a/testing/erlang/otp-0004-Do-not-install-Java-sources.patch b/testing/erlang/otp-0004-Do-not-install-Java-sources.patch
deleted file mode 100644
index 65323fa..0000000
--- a/testing/erlang/otp-0004-Do-not-install-Java-sources.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Sat, 19 Jun 2010 09:25:18 +0400
-Subject: [PATCH] Do not install Java sources
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
-index 273614e..5b1fb57 100644
---- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
-+++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
-@@ -112,8 +112,6 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
--	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
- 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
- 
-diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-index ea3ab77..e95757e 100644
---- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-@@ -119,8 +119,6 @@ release release_docs release_tests release_html:
- 	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
- 
- release_spec: opt
--	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
--	$(V_at)$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
- 	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/priv"
- 	$(V_at)$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
- 	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
diff --git a/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
deleted file mode 100644
index 74f4587..0000000
--- a/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- otp_src_17.5/lib/os_mon/doc/src/Makefile
-+++ otp_src_17.5-fixed/lib/os_mon/doc/src/Makefile
-@@ -35,12 +35,17 @@
- # Target Specs
- # ----------------------------------------------------
- XML_APPLICATION_FILES = ref_man.xml
-+ifeq ($(findstring win32,$(TARGET)),win32)
-+NTEVENTLOG_DOCFILE=nteventlog.xml
-+else
-+NTEVENTLOG_DOCFILE=
-+endif
- XML_REF3_FILES = cpu_sup.xml \
- 	disksup.xml \
- 	memsup.xml \
- 	os_mon_mib.xml \
- 	os_sup.xml \
--	nteventlog.xml
-+	$(NTEVENTLOG_DOCFILE)
- 
- XML_REF6_FILES = os_mon_app.xml 
- 
---- otp_src_17.5/lib/os_mon/ebin/os_mon.app
-+++ otp_src_17.5-fixed/lib/os_mon/ebin/os_mon.app
-@@ -21,7 +21,7 @@
-    [{description, "CPO  CXC 138 46"},
-     {vsn, "2.3.1"},
-     {modules, [os_mon, os_mon_mib, os_sup,
--               disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
-+               disksup, memsup, cpu_sup, os_mon_sysinfo]},
-     {registered, [os_mon_sup, os_mon_sysinfo, disksup, memsup, cpu_sup, 
-                   os_sup_server]},
-     {applications, [kernel, stdlib, sasl]},
---- otp_src_17.5/lib/os_mon/src/Makefile
-+++ otp_src_17.5-fixed/lib/os_mon/src/Makefile
-@@ -33,8 +33,13 @@
- # ----------------------------------------------------
- # Target Specs
- # ----------------------------------------------------
-+ifeq ($(findstring win32,$(TARGET)),win32)
-+NTEVENTLOG=nteventlog
-+else
-+NTEVENTLOG=
-+endif
- MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
--	nteventlog
-+	 $(NTEVENTLOG)
- 
- INCLUDE=../include
- CSRC=../c_src
-@@ -78,7 +83,11 @@
- # ----------------------------------------------------
- 
- $(APP_TARGET): $(APP_SRC) ../vsn.mk
-+ifeq ($(findstring win32,$(TARGET)),win32)
- 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-+else
-+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@
-+endif
- 
- $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
diff --git a/testing/erlang/otp-0006-Do-not-install-erlang-sources.patch b/testing/erlang/otp-0006-Do-not-install-erlang-sources.patch
deleted file mode 100644
index 9e0e3a9..0000000
--- a/testing/erlang/otp-0006-Do-not-install-erlang-sources.patch
+++ /dev/null
@@ -1,1006 +0,0 @@
-From: Hans Ulrich Niedermann <[email-masked]>
-Date: Mon, 21 Mar 2011 15:41:49 +0100
-Subject: [PATCH] Do not install erlang sources
-
-Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-Signed-off-by: Hans Ulrich Niedermann <[email-masked]>
-
-diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
-index 4ea2d41..e1466c1 100644
---- a/erts/preloaded/src/Makefile
-+++ b/erts/preloaded/src/Makefile
-@@ -85,8 +85,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: $(APP_TARGET)
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
-index 6798da0..4e3ae0e 100644
---- a/lib/asn1/src/Makefile
-+++ b/lib/asn1/src/Makefile
-@@ -154,7 +154,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
- 	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
- 
-diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index 8d74546..a25d85d 100644
---- a/lib/common_test/src/Makefile
-+++ b/lib/common_test/src/Makefile
-@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
-index c6d09d8..46dcdf4 100644
---- a/lib/compiler/src/Makefile
-+++ b/lib/compiler/src/Makefile
-@@ -165,8 +165,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
--		$(YRL_FILE) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
-+		"$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
-index 2864ee0..0e27bb6 100644
---- a/lib/cosEvent/src/Makefile
-+++ b/lib/cosEvent/src/Makefile
-@@ -202,7 +202,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
-index b4b74bd..420f566 100644
---- a/lib/cosEventDomain/src/Makefile
-+++ b/lib/cosEventDomain/src/Makefile
-@@ -171,7 +171,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
-index 9d3abb9..c3d83a5 100644
---- a/lib/cosFileTransfer/src/Makefile
-+++ b/lib/cosFileTransfer/src/Makefile
-@@ -179,9 +179,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
--	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
- release_docs_spec:
-diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
-index 13153bd..0860700 100644
---- a/lib/cosNotification/src/Makefile
-+++ b/lib/cosNotification/src/Makefile
-@@ -370,8 +370,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
-index d7b75d8..fba8746 100644
---- a/lib/cosProperty/src/Makefile
-+++ b/lib/cosProperty/src/Makefile
-@@ -179,8 +179,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
-index 0ab2b41..c29caeb 100644
---- a/lib/cosTime/src/Makefile
-+++ b/lib/cosTime/src/Makefile
-@@ -198,8 +198,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
-index 7b4a9cf..290707c 100644
---- a/lib/cosTransactions/src/Makefile
-+++ b/lib/cosTransactions/src/Makefile
-@@ -173,7 +173,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
-index c185c15..68bacba 100644
---- a/lib/crypto/src/Makefile
-+++ b/lib/crypto/src/Makefile
-@@ -81,8 +81,6 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
- 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index d61519f..bfdb0c9 100644
---- a/lib/debugger/src/Makefile
-+++ b/lib/debugger/src/Makefile
-@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
-index 91fbdca..01fb30c 100644
---- a/lib/dialyzer/src/Makefile
-+++ b/lib/dialyzer/src/Makefile
-@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
-+	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
- 		"$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
-diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
-index 9afccf2..107d65b 100644
---- a/lib/diameter/src/Makefile
-+++ b/lib/diameter/src/Makefile
-@@ -250,11 +250,8 @@ release_spec: opt
- 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
- 
- $(TARGET_DIRS:%/=release_src_%): release_src_%:
--	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
--	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
--	                               $(INTERNAL_HRLS)) \
--	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
--	                "$(RELSYSDIR)/src/$*"
-+	$(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \
-+	                "$(RELSYSDIR)/src/$*" || true
- 
- $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
-diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
-index 4e5a418..c0bb0c3 100644
---- a/lib/edoc/src/Makefile
-+++ b/lib/edoc/src/Makefile
-@@ -88,7 +88,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 
- release_docs_spec:
- 
-diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
-index 2e1110e..b7f9b09 100644
---- a/lib/eldap/src/Makefile
-+++ b/lib/eldap/src/Makefile
-@@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
--	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
-index ef96f5d..d9a2f0d 100644
---- a/lib/erl_docgen/src/Makefile
-+++ b/lib/erl_docgen/src/Makefile
-@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
-index 377e593..668e278 100644
---- a/lib/et/src/Makefile
-+++ b/lib/et/src/Makefile
-@@ -108,7 +108,6 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index 47aef10..78ddc74 100644
---- a/lib/eunit/src/Makefile
-+++ b/lib/eunit/src/Makefile
-@@ -120,7 +120,6 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
-diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
-index f0200ca..86d3f74 100644
---- a/lib/gs/src/Makefile
-+++ b/lib/gs/src/Makefile
-@@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
--		$(GSTK_GENERIC) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \
-+		"$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
-diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
-index d13dfb3..b09d62b 100644
---- a/lib/hipe/cerl/Makefile
-+++ b/lib/hipe/cerl/Makefile
-@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/cerl"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
-index 75e156b..5e394ca 100644
---- a/lib/hipe/flow/Makefile
-+++ b/lib/hipe/flow/Makefile
-@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/flow"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
-+	$(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
-index 87015aa..84f870d 100644
---- a/lib/hipe/icode/Makefile
-+++ b/lib/hipe/icode/Makefile
-@@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/icode"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile
-index 92f3789..82f3e77 100644
---- a/lib/hipe/llvm/Makefile
-+++ b/lib/hipe/llvm/Makefile
-@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/llvm
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 
-diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
-index 66e4c3e..2f11670 100644
---- a/lib/hipe/main/Makefile
-+++ b/lib/hipe/main/Makefile
-@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/main"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
-index 16166f5..0ba5845 100644
---- a/lib/hipe/misc/Makefile
-+++ b/lib/hipe/misc/Makefile
-@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/misc"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
-index 751e876..98b7911 100644
---- a/lib/hipe/rtl/Makefile
-+++ b/lib/hipe/rtl/Makefile
-@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/rtl"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
-index a5ee232..f03e41d 100644
---- a/lib/hipe/util/Makefile
-+++ b/lib/hipe/util/Makefile
-@@ -49,7 +49,6 @@ HIPE_MODULES =
- endif
- MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES)
- 
--HRL_FILES=
- ERL_FILES= $(MODULES:%=%.erl)
- TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
- DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
-@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/util"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
-index e8769d2..965d0e7 100644
---- a/lib/ic/src/Makefile
-+++ b/lib/ic/src/Makefile
-@@ -199,7 +199,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
- 	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
-diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
-index 2c3d2b6..de0450e 100644
---- a/lib/inets/src/ftp/Makefile
-+++ b/lib/inets/src/ftp/Makefile
-@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
-index f0d4ce1..35c4ffc 100644
---- a/lib/inets/src/http_client/Makefile
-+++ b/lib/inets/src/http_client/Makefile
-@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_client"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
-index 51167b3..a623824 100644
---- a/lib/inets/src/http_lib/Makefile
-+++ b/lib/inets/src/http_lib/Makefile
-@@ -89,7 +89,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_lib"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
-index 2660d04..c873a27 100644
---- a/lib/inets/src/http_server/Makefile
-+++ b/lib/inets/src/http_server/Makefile
-@@ -126,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
-index 22426ee..0b0cfb8 100644
---- a/lib/inets/src/inets_app/Makefile
-+++ b/lib/inets/src/inets_app/Makefile
-@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
-diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
-index b368b12..5eddaf0 100644
---- a/lib/inets/src/tftp/Makefile
-+++ b/lib/inets/src/tftp/Makefile
-@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
-index c7c70ad..3e1792f 100644
---- a/lib/kernel/src/Makefile
-+++ b/lib/kernel/src/Makefile
-@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
-index d18da53..4a9f4d2 100644
---- a/lib/megaco/src/app/Makefile
-+++ b/lib/megaco/src/app/Makefile
-@@ -113,7 +113,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/app"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
-index c1fd66b..0699ffa 100644
---- a/lib/megaco/src/binary/Makefile
-+++ b/lib/megaco/src/binary/Makefile
-@@ -175,7 +175,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/binary"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary"
- 
- 
- release_docs_spec:
-diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
-index 7cecef1..841a88a 100644
---- a/lib/megaco/src/engine/Makefile
-+++ b/lib/megaco/src/engine/Makefile
-@@ -101,7 +101,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/engine"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 
- 
-diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index bd62e8b..cce5a8d 100644
---- a/lib/megaco/src/flex/Makefile.in
-+++ b/lib/megaco/src/flex/Makefile.in
-@@ -267,8 +267,6 @@ release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
--	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
- 	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
-diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
-index 0c30aba..aa553ff 100644
---- a/lib/megaco/src/tcp/Makefile
-+++ b/lib/megaco/src/tcp/Makefile
-@@ -93,7 +93,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tcp"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
- 
- 
- release_docs_spec:
-diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
-index cab4256..d5cf217 100644
---- a/lib/megaco/src/text/Makefile
-+++ b/lib/megaco/src/text/Makefile
-@@ -134,7 +134,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/text"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
- 
- 
- release_docs_spec:
-diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
-index 9486804..ea4830c 100644
---- a/lib/megaco/src/udp/Makefile
-+++ b/lib/megaco/src/udp/Makefile
-@@ -93,7 +93,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/udp"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
- 
- 
- release_docs_spec:
-diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
-index ac38fa0..20bce7e 100644
---- a/lib/mnesia/src/Makefile
-+++ b/lib/mnesia/src/Makefile
-@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index c120865..6831d23 100644
---- a/lib/observer/src/Makefile
-+++ b/lib/observer/src/Makefile
-@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
- 	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
-diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
-index bfbda8a..6e4ad54 100644
---- a/lib/odbc/src/Makefile
-+++ b/lib/odbc/src/Makefile
-@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
-index 8140620..73df530 100644
---- a/lib/orber/COSS/CosNaming/Makefile
-+++ b/lib/orber/COSS/CosNaming/Makefile
-@@ -144,8 +144,8 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
--	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
-+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
-+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming"
- 
- 
- release_docs_spec:
-diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
-index 398e481..f079e77 100644
---- a/lib/orber/src/Makefile
-+++ b/lib/orber/src/Makefile
-@@ -252,7 +252,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index 4e78cf8..69d434c 100644
---- a/lib/os_mon/src/Makefile
-+++ b/lib/os_mon/src/Makefile
-@@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-diff --git a/lib/ose/src/Makefile b/lib/ose/src/Makefile
-index 88f8957..ab08a88 100644
---- a/lib/ose/src/Makefile
-+++ b/lib/ose/src/Makefile
-@@ -93,9 +93,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
-index 6096240..cbc41e6 100644
---- a/lib/otp_mibs/src/Makefile
-+++ b/lib/otp_mibs/src/Makefile
-@@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
-index 2ee2285..ea075ed 100644
---- a/lib/parsetools/src/Makefile
-+++ b/lib/parsetools/src/Makefile
-@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
-index 0282d63..5902da3 100644
---- a/lib/percept/src/Makefile
-+++ b/lib/percept/src/Makefile
-@@ -96,7 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- #	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- #	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
-index c1b3bc8..3d021cf 100644
---- a/lib/public_key/asn1/Makefile
-+++ b/lib/public_key/asn1/Makefile
-@@ -95,8 +95,8 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
--	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \
--		 $(GEN_ERLS) "$(RELSYSDIR)/asn1"
-+	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \
-+		 "$(RELSYSDIR)/asn1"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
-index 09393e8..eb4c54d 100644
---- a/lib/public_key/src/Makefile
-+++ b/lib/public_key/src/Makefile
-@@ -49,8 +49,6 @@ MODULES = \
- 
- HRL_FILES = $(INCLUDE)/public_key.hrl 
- 
--INTERNAL_HRL_FILES = 
--
- ERL_FILES = $(MODULES:%=%.erl)
- 
- TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-@@ -103,8 +101,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
-index b8387ff..2012af9 100644
---- a/lib/reltool/src/Makefile
-+++ b/lib/reltool/src/Makefile
-@@ -99,7 +99,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
-index 8d2bcfe..d1a9cac 100644
---- a/lib/runtime_tools/src/Makefile
-+++ b/lib/runtime_tools/src/Makefile
-@@ -96,8 +96,6 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
-diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
-index ab2d3a3..bb53a67 100644
---- a/lib/sasl/src/Makefile
-+++ b/lib/sasl/src/Makefile
-@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
-index beed696..752072d 100644
---- a/lib/snmp/src/agent/Makefile
-+++ b/lib/snmp/src/agent/Makefile
-@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
-index b8cc4b8..d806efb 100644
---- a/lib/snmp/src/app/Makefile
-+++ b/lib/snmp/src/app/Makefile
-@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
-index f63fc18..9759451 100644
---- a/lib/snmp/src/compile/Makefile
-+++ b/lib/snmp/src/compile/Makefile
-@@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
--	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
-diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
-index c76dbac..548823a 100644
---- a/lib/snmp/src/manager/Makefile
-+++ b/lib/snmp/src/manager/Makefile
-@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/manager"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
-index 698c341..3344a0c 100644
---- a/lib/snmp/src/misc/Makefile
-+++ b/lib/snmp/src/misc/Makefile
-@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index 90d7110..e725c6c 100644
---- a/lib/ssh/src/Makefile
-+++ b/lib/ssh/src/Makefile
-@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
-index 0c00a65..acec405 100644
---- a/lib/ssl/src/Makefile
-+++ b/lib/ssl/src/Makefile
-@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
-index 9ab2cd4..876bfd2 100644
---- a/lib/stdlib/src/Makefile
-+++ b/lib/stdlib/src/Makefile
-@@ -203,7 +203,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
-index c9fbad8..2fc7f18 100644
---- a/lib/syntax_tools/src/Makefile
-+++ b/lib/syntax_tools/src/Makefile
-@@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src"
- 
- release_docs_spec:
- 
-diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
-index 35bbad3..deb7caf 100644
---- a/lib/test_server/src/Makefile
-+++ b/lib/test_server/src/Makefile
-@@ -123,7 +123,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
-index e606b97..1beb8cc 100644
---- a/lib/tools/src/Makefile
-+++ b/lib/tools/src/Makefile
-@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
-index a7059de..0b1ae2a 100644
---- a/lib/typer/src/Makefile
-+++ b/lib/typer/src/Makefile
-@@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \
--		"$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
-index af565c8..6c65b26 100644
---- a/lib/webtool/src/Makefile
-+++ b/lib/webtool/src/Makefile
-@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
-index 26574ed..266a5d6 100644
---- a/lib/wx/src/Makefile
-+++ b/lib/wx/src/Makefile
-@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
- include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt 
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/gen"
--	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen"
-+	$(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
-index d5ce3fe..e21e4b1 100644
---- a/lib/xmerl/src/Makefile
-+++ b/lib/xmerl/src/Makefile
-@@ -217,9 +217,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 
diff --git a/testing/erlang/otp-0007-Split-off-webtool-dependency-from-tools.patch b/testing/erlang/otp-0007-Split-off-webtool-dependency-from-tools.patch
deleted file mode 100644
index f2de8ac..0000000
--- a/testing/erlang/otp-0007-Split-off-webtool-dependency-from-tools.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Sat, 8 Nov 2014 22:54:57 +0300
-Subject: [PATCH] Split off webtool dependency from tools
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl
-index 69f2f3b..9085300 100644
---- a/lib/tools/src/cover_web.erl
-+++ b/lib/tools/src/cover_web.erl
-@@ -50,14 +50,25 @@
- %%%----------------------------------------------------------------------
- %% Start webtool and webcover from erlang shell
- start() ->
--    webtool:start(),
--    webtool:start_tools([],"app=webcover"),
-+    try
-+        % Disable automatic dependency picking up
-+        erlang:apply(webtool, start, []),
-+        erlang:apply(webtool, start_tools, [[],"app=webcover"])
-+    catch
-+        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
-+    end,
-     ok.
- 
- %% Stop webtool and webcover from erlang shell
- stop() ->
--    webtool:stop_tools([],"app=webcover"),
--    webtool:stop().
-+    try
-+        % Disable automatic dependency picking up
-+        erlang:apply(webtool, stop_tools, [[],"app=webcover"]),
-+        erlang:apply(webtool, stop, [])
-+    catch
-+        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
-+    end,
-+    ok.
- 
- 
- 
diff --git a/testing/erlang/otp-0008-Introduce-os-getenv-2.patch b/testing/erlang/otp-0008-Introduce-os-getenv-2.patch
deleted file mode 100644
index 6c48db2..0000000
--- a/testing/erlang/otp-0008-Introduce-os-getenv-2.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Sat, 8 Nov 2014 15:11:04 +0300
-Subject: [PATCH] Introduce os:getenv/2
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
-index 2b57e75..8b85f24 100644
---- a/lib/kernel/doc/src/os.xml
-+++ b/lib/kernel/doc/src/os.xml
-@@ -100,6 +100,19 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
-       </desc>
-     </func>
-     <func>
-+      <name name="getenv" arity="2"/>
-+      <fsummary>Get the value of an environment variable</fsummary>
-+      <desc>
-+        <p>Returns the <c><anno>Value</anno></c> of the environment variable
-+          <c><anno>VarName</anno></c>, or <c>DefaultValue</c> if the environment variable
-+          is undefined.</p>
-+	<p>If Unicode file name encoding is in effect (see the <seealso
-+	marker="erts:erl#file_name_encoding">erl manual
-+	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
-+	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
-+      </desc>
-+    </func>
-+    <func>
-       <name name="getpid" arity="0"/>
-       <fsummary>Return the process identifier of the emulator process</fsummary>
-       <desc>
-diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
-index 187fd00..8aaf13b 100644
---- a/lib/kernel/src/os.erl
-+++ b/lib/kernel/src/os.erl
-@@ -26,7 +26,7 @@
- 
- %%% BIFs
- 
---export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
-+-export([getenv/0, getenv/1, getenv/2, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
- 
- -spec getenv() -> [string()].
- 
-@@ -39,6 +39,19 @@ getenv() -> erlang:nif_error(undef).
- getenv(_) ->
-     erlang:nif_error(undef).
- 
-+-spec getenv(VarName, DefaultValue) -> Value when
-+      VarName :: string(),
-+      DefaultValue :: string(),
-+      Value :: string().
-+
-+getenv(VarName, DefaultValue) ->
-+    case os:getenv(VarName) of
-+        false ->
-+           DefaultValue;
-+        Value ->
-+            Value
-+    end.
-+
- -spec getpid() -> Value when
-       Value :: string().
- 
diff --git a/testing/erlang/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch b/testing/erlang/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
deleted file mode 100644
index fa55663..0000000
--- a/testing/erlang/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Sergei Golovan <[email-masked]>
-Date: Sun, 30 Nov 2014 20:20:41 +0300
-Subject: [PATCH] Patch removes support for SSLv3 protocol because it is proved
- to be insecure and nobody should use it anymore.
-
-
-diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
-index b53344e..b245621 100644
---- a/lib/ssl/doc/src/ssl.xml
-+++ b/lib/ssl/doc/src/ssl.xml
-@@ -123,7 +123,7 @@
- 
-     <p><c>sslsocket() - opaque to the user. </c></p>
-     
--    <p><c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
-+    <p><c>protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
-     
-     <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>
-     
-diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
-index 43cb393..ff12e04 100644
---- a/lib/ssl/doc/src/ssl_app.xml
-+++ b/lib/ssl/doc/src/ssl_app.xml
-@@ -47,10 +47,10 @@
-       </p>
-     <p>Note that the environment parameters can be set on the command line,
-       for instance,</p>
--    <p><c>erl ... -ssl protocol_version '[sslv3, tlsv1]' ...</c>.
-+    <p><c>erl ... -ssl protocol_version '[tlsv1.1, tlsv1]' ...</c>.
-       </p>
-     <taglist>
--      <tag><c><![CDATA[protocol_version = [sslv3|tlsv1] <optional>]]></c>.</tag>
-+      <tag><c><![CDATA[protocol_version = [tlsv1|tlsv1.1|tlsv1.2] <optional>]]></c>.</tag>
-       <item>
- 	<p>Protocol that will be supported by started clients and
- 	servers. If this option is not set it will default to all
-@@ -58,6 +58,9 @@
- 	Note that this option may be overridden by the version option
- 	to ssl:connect/[2,3] and ssl:listen/2.
- 	</p>
-+	<p>For Debian GNU/Linux distribution the sslv3 protocol was
-+	disabled due to its security issues.
-+	</p>
-       </item>
- 
-       <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
-diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
-index 75efb64..155fa81 100644
---- a/lib/ssl/src/ssl_internal.hrl
-+++ b/lib/ssl/src/ssl_internal.hrl
-@@ -67,8 +67,8 @@
- -define(TRUE, 0).
- -define(FALSE, 1).
- 
---define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
---define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
-+-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]).
-+-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]).
- -define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
- -define(MIN_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
- 
-diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl
-index 6aab35d..1511abd 100644
---- a/lib/ssl/src/ssl_record.hrl
-+++ b/lib/ssl/src/ssl_record.hrl
-@@ -144,6 +144,7 @@
- %% 	 }).
- 
- -define(LOWEST_MAJOR_SUPPORTED_VERSION, 3).
-+-define(LOWEST_MINOR_SUPPORTED_VERSION, 1).
- 	
- 
- -record(generic_stream_cipher, {
-diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
-index f50ea22..aa4fc8d 100644
---- a/lib/ssl/src/tls_record.erl
-+++ b/lib/ssl/src/tls_record.erl
-@@ -276,14 +276,20 @@ supported_protocol_versions([_|_] = Vsns) ->
- %%--------------------------------------------------------------------
- -spec is_acceptable_version(tls_version()) -> boolean().
- is_acceptable_version({N,_}) 
--  when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+  when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+    true;
-+is_acceptable_version({N,M}) 
-+  when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
-     true;
- is_acceptable_version(_) ->
-     false.
- 
- -spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean().
- is_acceptable_version({N,_} = Version, Versions)   
--  when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+  when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+    lists:member(Version, Versions);
-+is_acceptable_version({N,M} = Version, Versions)   
-+  when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
-     lists:member(Version, Versions);
- is_acceptable_version(_,_) ->
-     false.
diff --git a/testing/erlang/remove-private-unit32.patch b/testing/erlang/remove-private-unit32.patch
deleted file mode 100644
index cfc08cc..0000000
--- a/testing/erlang/remove-private-unit32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- otp_src_17.4/erts/emulator/sys/common/erl_poll.h
-+++ otp_src_17.4-fixed/erts/emulator/sys/common/erl_poll.h
-@@ -129,7 +129,7 @@
- #include <sys/epoll.h>
- 
- #define ERTS_POLL_EV_E2N(EV) \
--  ((__uint32_t) (EV))
-+  ((uint32_t) (EV))
- #define ERTS_POLL_EV_N2E(EV) \
-   ((ErtsPollEvents) (EV))
- 
diff --git a/testing/erlang/replace_glibc_check.patch b/testing/erlang/replace_glibc_check.patch
deleted file mode 100644
index 170bbbb..0000000
--- a/testing/erlang/replace_glibc_check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- otp_src_17.4/lib/erl_interface/src/connect/ei_resolve.c
-+++ otp_src_17.4-fixed/lib/erl_interface/src/connect/ei_resolve.c
-@@ -615,7 +615,7 @@
- #ifndef HAVE_GETHOSTBYNAME_R
-   return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop);
- #else
--#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
-+#if (defined(_BSD_SOURCE) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
-   struct hostent *result;
- 
-   gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result,
-@@ -642,7 +642,7 @@
- #ifndef HAVE_GETHOSTBYNAME_R
-   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
- #else
--#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
-+#if (defined(_BSD_SOURCE) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
-   struct hostent *result;
- 
-   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
-- 
2.4.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---