From 815be9fb3918d997f76371bce471864b73764eef Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 15 Oct 2015 18:35:51 +0000 Subject: community/erlang: move from main --- ...at-man-pages-and-do-not-install-miscellan.patch | 37 + community/erlang/0002-Remove-rpath.patch | 28 + .../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 | 849 +++++++++++++++++++++ ...7-Split-off-webtool-dependency-from-tools.patch | 38 + community/erlang/0010-fix-nteventlog-remove.patch | 11 + community/erlang/0020-remove-private-unit32.patch | 11 + community/erlang/0030-replace_glibc_check.patch | 20 + .../0060-set-disksup_posix_only-to-true.patch | 22 + community/erlang/0070-hipe_x86_signal-fix.patch | 21 + community/erlang/APKBUILD | 252 ++++++ ...at-man-pages-and-do-not-install-miscellan.patch | 37 - main/erlang/0002-Remove-rpath.patch | 28 - main/erlang/0003-Do-not-install-C-sources.patch | 143 ---- main/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 | 849 --------------------- ...7-Split-off-webtool-dependency-from-tools.patch | 38 - main/erlang/0010-fix-nteventlog-remove.patch | 11 - main/erlang/0020-remove-private-unit32.patch | 11 - main/erlang/0030-replace_glibc_check.patch | 20 - .../0060-set-disksup_posix_only-to-true.patch | 22 - main/erlang/0070-hipe_x86_signal-fix.patch | 21 - main/erlang/APKBUILD | 252 ------ 26 files changed, 1517 insertions(+), 1517 deletions(-) create mode 100644 community/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch create mode 100644 community/erlang/0002-Remove-rpath.patch create mode 100644 community/erlang/0003-Do-not-install-C-sources.patch create mode 100644 community/erlang/0004-Do-not-install-Java-sources.patch create mode 100644 community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch create mode 100644 community/erlang/0006-Do-not-install-erlang-sources.patch create mode 100644 community/erlang/0007-Split-off-webtool-dependency-from-tools.patch create mode 100644 community/erlang/0010-fix-nteventlog-remove.patch create mode 100644 community/erlang/0020-remove-private-unit32.patch create mode 100644 community/erlang/0030-replace_glibc_check.patch create mode 100644 community/erlang/0060-set-disksup_posix_only-to-true.patch create mode 100644 community/erlang/0070-hipe_x86_signal-fix.patch create mode 100644 community/erlang/APKBUILD delete mode 100644 main/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch delete mode 100644 main/erlang/0002-Remove-rpath.patch delete mode 100644 main/erlang/0003-Do-not-install-C-sources.patch delete mode 100644 main/erlang/0004-Do-not-install-Java-sources.patch delete mode 100644 main/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch delete mode 100644 main/erlang/0006-Do-not-install-erlang-sources.patch delete mode 100644 main/erlang/0007-Split-off-webtool-dependency-from-tools.patch delete mode 100644 main/erlang/0010-fix-nteventlog-remove.patch delete mode 100644 main/erlang/0020-remove-private-unit32.patch delete mode 100644 main/erlang/0030-replace_glibc_check.patch delete mode 100644 main/erlang/0060-set-disksup_posix_only-to-true.patch delete mode 100644 main/erlang/0070-hipe_x86_signal-fix.patch delete mode 100644 main/erlang/APKBUILD diff --git a/community/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/community/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch new file mode 100644 index 0000000000..fef4a7ff98 --- /dev/null +++ b/community/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -0,0 +1,37 @@ +From: Peter Lemenkov +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 + +--- 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/community/erlang/0002-Remove-rpath.patch b/community/erlang/0002-Remove-rpath.patch new file mode 100644 index 0000000000..71658fe396 --- /dev/null +++ b/community/erlang/0002-Remove-rpath.patch @@ -0,0 +1,28 @@ +From: Peter Lemenkov +Date: Thu, 25 Feb 2010 16:57:43 +0300 +Subject: [PATCH] Remove rpath + +Signed-off-by: Peter Lemenkov + +--- 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/community/erlang/0003-Do-not-install-C-sources.patch b/community/erlang/0003-Do-not-install-C-sources.patch new file mode 100644 index 0000000000..364c4ad790 --- /dev/null +++ b/community/erlang/0003-Do-not-install-C-sources.patch @@ -0,0 +1,143 @@ +From: Peter Lemenkov +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 + +--- 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/community/erlang/0004-Do-not-install-Java-sources.patch b/community/erlang/0004-Do-not-install-Java-sources.patch new file mode 100644 index 0000000000..799476c8c6 --- /dev/null +++ b/community/erlang/0004-Do-not-install-Java-sources.patch @@ -0,0 +1,28 @@ +From: Peter Lemenkov +Date: Sat, 19 Jun 2010 09:25:18 +0400 +Subject: [PATCH] Do not install Java sources + +Signed-off-by: Peter Lemenkov + +--- 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/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch new file mode 100644 index 0000000000..dcfa6bcfad --- /dev/null +++ b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -0,0 +1,57 @@ +From: Peter Lemenkov +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 + +--- 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/community/erlang/0006-Do-not-install-erlang-sources.patch b/community/erlang/0006-Do-not-install-erlang-sources.patch new file mode 100644 index 0000000000..a79dbba5de --- /dev/null +++ b/community/erlang/0006-Do-not-install-erlang-sources.patch @@ -0,0 +1,849 @@ +--- otp_src_18.1-orig/erts/preloaded/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/asn1/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/common_test/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/compiler/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosEvent/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosEventDomain/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosFileTransfer/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosNotification/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosProperty/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosTime/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/cosTransactions/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/crypto/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/debugger/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/dialyzer/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/diameter/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/edoc/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/eldap/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/erl_docgen/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/et/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/eunit/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/gs/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/cerl/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/flow/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/icode/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/llvm/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/main/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/misc/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/rtl/Makefile ++++ otp_src_18.1-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.1-orig/lib/hipe/util/Makefile ++++ otp_src_18.1-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.1-orig/lib/ic/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/inets/src/ftp/Makefile ++++ otp_src_18.1-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.1-orig/lib/inets/src/http_client/Makefile ++++ otp_src_18.1-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.1-orig/lib/inets/src/http_lib/Makefile ++++ otp_src_18.1-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.1-orig/lib/inets/src/http_server/Makefile ++++ otp_src_18.1-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.1-orig/lib/inets/src/inets_app/Makefile ++++ otp_src_18.1-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.1-orig/lib/inets/src/tftp/Makefile ++++ otp_src_18.1-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.1-orig/lib/kernel/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/megaco/src/app/Makefile ++++ otp_src_18.1-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.1-orig/lib/megaco/src/binary/Makefile ++++ otp_src_18.1-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.1-orig/lib/megaco/src/engine/Makefile ++++ otp_src_18.1-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.1-orig/lib/megaco/src/flex/Makefile.in ++++ otp_src_18.1-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.1-orig/lib/megaco/src/tcp/Makefile ++++ otp_src_18.1-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.1-orig/lib/megaco/src/text/Makefile ++++ otp_src_18.1-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.1-orig/lib/megaco/src/udp/Makefile ++++ otp_src_18.1-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.1-orig/lib/mnesia/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/observer/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/odbc/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/orber/COSS/CosNaming/Makefile ++++ otp_src_18.1-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.1-orig/lib/orber/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/os_mon/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/ose/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/otp_mibs/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/parsetools/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/percept/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/public_key/asn1/Makefile ++++ otp_src_18.1-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.1-orig/lib/public_key/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/reltool/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/runtime_tools/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/sasl/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/snmp/src/agent/Makefile ++++ otp_src_18.1-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.1-orig/lib/snmp/src/app/Makefile ++++ otp_src_18.1-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.1-orig/lib/snmp/src/compile/Makefile ++++ otp_src_18.1-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.1-orig/lib/snmp/src/manager/Makefile ++++ otp_src_18.1-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.1-orig/lib/snmp/src/misc/Makefile ++++ otp_src_18.1-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.1-orig/lib/ssh/src/Makefile ++++ otp_src_18.1-fixed/lib/ssh/src/Makefile +@@ -135,7 +135,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.1-orig/lib/ssl/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/stdlib/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/syntax_tools/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/test_server/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/tools/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/typer/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/webtool/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/wx/src/Makefile ++++ otp_src_18.1-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.1-orig/lib/xmerl/src/Makefile ++++ otp_src_18.1-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/community/erlang/0007-Split-off-webtool-dependency-from-tools.patch b/community/erlang/0007-Split-off-webtool-dependency-from-tools.patch new file mode 100644 index 0000000000..6a58f5cea0 --- /dev/null +++ b/community/erlang/0007-Split-off-webtool-dependency-from-tools.patch @@ -0,0 +1,38 @@ +From: Peter Lemenkov +Date: Sat, 8 Nov 2014 22:54:57 +0300 +Subject: [PATCH] Split off webtool dependency from tools + +Signed-off-by: Peter Lemenkov + +--- 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/community/erlang/0010-fix-nteventlog-remove.patch b/community/erlang/0010-fix-nteventlog-remove.patch new file mode 100644 index 0000000000..c3d066bdfb --- /dev/null +++ b/community/erlang/0010-fix-nteventlog-remove.patch @@ -0,0 +1,11 @@ +--- otp_src_18.0/lib/os_mon/src/os_mon.app.src ++++ otp_src_18.0-fixed/lib/os_mon/src/os_mon.app.src +@@ -22,7 +22,7 @@ + [{description, "CPO CXC 138 46"}, + {vsn, "%VSN%"}, + {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/community/erlang/0020-remove-private-unit32.patch b/community/erlang/0020-remove-private-unit32.patch new file mode 100644 index 0000000000..ec01499571 --- /dev/null +++ b/community/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/community/erlang/0030-replace_glibc_check.patch b/community/erlang/0030-replace_glibc_check.patch new file mode 100644 index 0000000000..5ae980492a --- /dev/null +++ b/community/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/community/erlang/0060-set-disksup_posix_only-to-true.patch b/community/erlang/0060-set-disksup_posix_only-to-true.patch new file mode 100644 index 0000000000..a32c60c200 --- /dev/null +++ b/community/erlang/0060-set-disksup_posix_only-to-true.patch @@ -0,0 +1,22 @@ +--- otp_src_18.0/lib/os_mon/src/disksup.erl ++++ otp_src_18.0-fixed/lib/os_mon/src/disksup.erl +@@ -87,7 +87,7 @@ + + param_default(disk_space_check_interval) -> 30; + param_default(disk_almost_full_threshold) -> 0.80; +-param_default(disksup_posix_only) -> false. ++param_default(disksup_posix_only) -> true. + + %%---------------------------------------------------------------------- + %% gen_server callbacks +--- otp_src_18.0/lib/os_mon/test/disksup_SUITE.erl ++++ otp_src_18.0-fixed/lib/os_mon/test/disksup_SUITE.erl +@@ -337,7 +337,7 @@ + []; + restart(Config) when is_list(Config) -> + ok = application:set_env(os_mon, start_disksup, true), +- ok = application:set_env(os_mon, disksup_posix_only, false), ++ ok = application:set_env(os_mon, disksup_posix_only, true), + {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup), + ok. + diff --git a/community/erlang/0070-hipe_x86_signal-fix.patch b/community/erlang/0070-hipe_x86_signal-fix.patch new file mode 100644 index 0000000000..728d47da55 --- /dev/null +++ b/community/erlang/0070-hipe_x86_signal-fix.patch @@ -0,0 +1,21 @@ +--- otp_src_18.1-orig/erts/emulator/hipe/hipe_x86_signal.c ++++ otp_src_18.1-fixed/erts/emulator/hipe/hipe_x86_signal.c +@@ -221,16 +221,15 @@ + #include + static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*); + #define init_done() (__next_sigaction != 0) +-#define __SIGACTION _sigaction ++#define __SIGACTION __sigaction + static void do_init(void) + { +- __next_sigaction = dlsym(RTLD_NEXT, "_sigaction"); ++ __next_sigaction = dlsym(RTLD_NEXT, "__sigaction"); + if (__next_sigaction != 0) + return; + perror("dlsym"); + abort(); + } +-#define _NSIG NSIG + #define INIT() do { if (!init_done()) do_init(); } while (0) + #endif /* not glibc or darwin */ + diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD new file mode 100644 index 0000000000..bffe6a8335 --- /dev/null +++ b/community/erlang/APKBUILD @@ -0,0 +1,252 @@ +# Contributor: Michael Mason +# Maintainer: Marlus Saraiva + +pkgname=erlang +pkgver=18.1 +_srcver=18.1 +pkgrel=3 +pkgdesc="General-purpose programming language and runtime environment" +url="http://www.erlang.org/" +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" +install="" +subpackages="$pkgname-dev + $pkgname-asn1:asn + $pkgname-common-test:common_test + $pkgname-compiler:compiler + $pkgname-cosevent:cos_event + $pkgname-coseventdomain:cos_event_domain + $pkgname-cosfiletransfer:cos_file_transfer + $pkgname-cosnotification:cos_notification + $pkgname-cosproperty:cos_property + $pkgname-costime:cos_time + $pkgname-costransaction:cos_transactions + $pkgname-crypto:crypto + $pkgname-debugger:debugger + $pkgname-dialyzer:dialyzer + $pkgname-diameter:diameter + $pkgname-edoc:edoc + $pkgname-eldap:eldap + $pkgname-erl-docgen:erl_docgen + $pkgname-erl-interface:erl_interface + $pkgname-erts:erts + $pkgname-et:et + $pkgname-eunit:eunit + $pkgname-gs:gs + $pkgname-hipe:hipe + $pkgname-ic:ic + $pkgname-inets:inets + $pkgname-jinterface:jinterface + $pkgname-kernel:kernel + $pkgname-megaco:megaco + $pkgname-mnesia:mnesia + $pkgname-observer:observer + $pkgname-odbc:odbc + $pkgname-orber:orber + $pkgname-os-mon:os_mon + $pkgname-ose:ose + $pkgname-otp-mibs:otp_mibs + $pkgname-parsetools:parsetools + $pkgname-percept:percept + $pkgname-public-key:public_key + $pkgname-reltool:reltool + $pkgname-runtime-tools:runtime_tools + $pkgname-sasl:sasl + $pkgname-snmp:snmp + $pkgname-ssh:ssh + $pkgname-ssl:ssl + $pkgname-stdlib:stdlib + $pkgname-syntax-tools:syntax_tools + $pkgname-test-server:test_server + $pkgname-tools:tools + $pkgname-typer:typer + $pkgname-webtool:webtool + $pkgname-xmerl:xmerl" +# 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 + 0060-set-disksup_posix_only-to-true.patch + 0070-hipe_x86_signal-fix.patch" + +_builddir="$srcdir"/otp_src_$_srcver + +prepare() { + local i + cd "$_builddir" + rm lib/os_mon/ebin/* + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + export CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS" + export PATH="/usr/lib/jvm/java-1.7-openjdk/bin:$PATH" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --host="$CHOST" \ + --build="$CBUILD" \ + --enable-threads \ + --enable-shared-zlib \ + --enable-ssl=dynamic-ssl-lib \ + --disable-hipe \ + || return 1 + make -j1 || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 + rm -rf "$pkgdir"/usr/lib/erlang/lib/wx-* +} + +_mv_erlang_lib() { + local lib=$1 + depends="$pkgname" + + mkdir -p "$subpkgdir"/usr/lib/erlang/lib + mv "$pkgdir"/usr/lib/erlang/lib/$lib-* "$subpkgdir"/usr/lib/erlang/lib/ +} + +asn() { _mv_erlang_lib asn1; } +common_test() { _mv_erlang_lib common_test; } +compiler() { _mv_erlang_lib compiler; } +cos_event() { _mv_erlang_lib cosEvent; } +cos_event_domain() { _mv_erlang_lib cosEventDomain; } +cos_file_transfer() { _mv_erlang_lib cosFileTransfer; } +cos_notification() { _mv_erlang_lib cosNotification; } +cos_property() { _mv_erlang_lib cosProperty; } +cos_time() { _mv_erlang_lib cosTime; } +cos_transactions() { _mv_erlang_lib cosTransactions; } +crypto() { _mv_erlang_lib crypto; } +debugger() { _mv_erlang_lib debugger; } +dialyzer() { _mv_erlang_lib dialyzer; } +diameter() { _mv_erlang_lib diameter; } +edoc() { _mv_erlang_lib edoc; } +eldap() { _mv_erlang_lib eldap; } +erl_docgen() { _mv_erlang_lib erl_docgen; } +erl_interface() { _mv_erlang_lib erl_interface; } +erts() { _mv_erlang_lib erts; } +et() { _mv_erlang_lib et; } +eunit() { _mv_erlang_lib eunit; } +gs() { _mv_erlang_lib gs; } +hipe() { _mv_erlang_lib hipe; } +ic() { _mv_erlang_lib ic; } +inets() { _mv_erlang_lib inets; } +jinterface() { _mv_erlang_lib jinterface; } +kernel() { _mv_erlang_lib kernel; } +megaco() { _mv_erlang_lib megaco; } +mnesia() { _mv_erlang_lib mnesia; } +observer() { _mv_erlang_lib observer; } +odbc() { _mv_erlang_lib odbc; } +orber() { _mv_erlang_lib orber; } +os_mon() { _mv_erlang_lib os_mon; } +ose() { _mv_erlang_lib ose; } +otp_mibs() { _mv_erlang_lib otp_mibs; } +parsetools() { _mv_erlang_lib parsetools; } +percept() { _mv_erlang_lib percept; } +public_key() { _mv_erlang_lib public_key; } +reltool() { _mv_erlang_lib reltool; } +runtime_tools() { _mv_erlang_lib runtime_tools; } +sasl() { _mv_erlang_lib sasl; } +snmp() { _mv_erlang_lib snmp; } +ssh() { _mv_erlang_lib ssh; } +ssl() { _mv_erlang_lib ssl; } +stdlib() { _mv_erlang_lib stdlib; } +syntax_tools() { _mv_erlang_lib syntax_tools; } +test_server() { _mv_erlang_lib test_server; } +tools() { _mv_erlang_lib tools; } +typer() { _mv_erlang_lib typer; } +webtool() { _mv_erlang_lib webtool; } +xmerl() { _mv_erlang_lib xmerl; } + +dev() { + local i= j= + depends="$pkgname=$pkgver-r$pkgrel $depends_dev" + pkgdesc="$pkgdesc (development files)" + + cd "$pkgdir" || return 0 + local libdirs=usr/ + [ -d lib/ ] && libdirs="lib/ $libdirs" + for i in usr/include usr/lib/pkgconfig usr/share/aclocal\ + usr/share/gettext usr/bin/*-config \ + usr/share/vala/vapi usr/share/gir-[0-9]*\ + usr/share/qt*/mkspecs \ + usr/lib/qt*/mkspecs \ + usr/lib/cmake \ + $(find . -name include -type d) \ + $(find $libdirs -name '*.[acho]' \ + -o -name '*.prl' 2>/dev/null); do + if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then + d="$subpkgdir/${i%/*}" # dirname $i + mkdir -p "$d" + mv "$pkgdir/$i" "$d" + rmdir "$pkgdir/${i%/*}" 2>/dev/null + fi + done + # move *.so links needed when linking the apps to -dev packages + for i in lib/*.so usr/lib/*.so; do + if [ -L "$i" ]; then + mkdir -p "$subpkgdir"/"${i%/*}" + mv "$i" "$subpkgdir/$i" || return 1 + fi + done + return 0 +} + + +md5sums="fa64015fdd133e155b5b19bf90ac8678 otp_src_18.1.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 +90f36608d2d8f71c8eb19126af06978b 0006-Do-not-install-erlang-sources.patch +b438c37818b5c82443682c3693dd7e53 0007-Split-off-webtool-dependency-from-tools.patch +0dd300003ff68fc46dc3c839c2541d53 0010-fix-nteventlog-remove.patch +062605d7f01f4685f1897ba2decc23a8 0020-remove-private-unit32.patch +7a5c956b7bf79e34a0f980d1e2a65bee 0030-replace_glibc_check.patch +d17fbaafa9f7820ade09b239c00aede6 0060-set-disksup_posix_only-to-true.patch +02a18c698b0ff37d0bcf106db57c1136 0070-hipe_x86_signal-fix.patch" +sha256sums="e4a147228a6b7fa60dce05c8adfb3cbc254d97cf6e45456d93d93adbde8b0f11 otp_src_18.1.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 +594745af27e73d8213e190eea654285bc4bdda706de4275f2b6dd64b2af720c3 0006-Do-not-install-erlang-sources.patch +9704a53bc4bd6f5624f9ce3f201128204011f4579f19b547df74d92ae22777cf 0007-Split-off-webtool-dependency-from-tools.patch +019c62ea3fee60068caa8c3152d7f96e76591fc5dc096abfcea48ec1593eb758 0010-fix-nteventlog-remove.patch +0b63ff5ce4e642d4225d5cc4d52d88dd5daf83ce5a2549ba0e5a14ce05e17ac2 0020-remove-private-unit32.patch +e3158dbb4bcb4677ceda39a374326c069de78a52e598ef8169a288b86a040a62 0030-replace_glibc_check.patch +3ffda0b3acbde755b496c1a974c20e1ca580432c403944c1c16836f48e248429 0060-set-disksup_posix_only-to-true.patch +97c430677f18f81bafc6af7bb45c5dddc5222597350a6813cb338d21acec464a 0070-hipe_x86_signal-fix.patch" +sha512sums="31e3a4f3d8da7877757fa4df427c59462cb68e0177f93698146ce17127406fd0ee77f819044cef10e4a18ed075deb44343d915148cf1fd4bce09a1e39edaaee6 otp_src_18.1.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 +b9aea9344703688ef5b98d530417c59166749de4f6d91fe8d01abaa7bd1946495ec4ab23e854947192659f49b35cbbead7c4f47836c3579ff844f23217e75cb4 0006-Do-not-install-erlang-sources.patch +d65fcfc3a9441941c6292c33d354964a82da11cc7a411dd0440719e490075ed588c1e70690e80650561749010d737394567f12ff73bd460f0d00c792c77cfae3 0007-Split-off-webtool-dependency-from-tools.patch +b7387f92f8c27a0565c7885bba4b357183c62d422616e073bc5ffad338a0e22cb5165dcb3b95bf0b920ba00831599f2216027883f4be255aa6f6150b68b7a37c 0010-fix-nteventlog-remove.patch +18f70c3a99ac8c44bc9d90dc3f0c072ad4df4ffe57a8d0677087c9e940ba138d7a7698d5cdbbe14875a6012d353a679fdb33d40fca3a3211f712af8c4b0cb0b4 0020-remove-private-unit32.patch +b554882bee1a70322cc8c5b973986047deaf4528fe1371df39cf72b27b2497a859463bdf8847ea6ea96cb0caaa6bd143c96a5dee28839164a547a66a30fcffd0 0030-replace_glibc_check.patch +f3c50f8610e08173c365a575737079b0259db6fc0dfa5b1be63c281b52358bbce9e2595132a8f6a06772785d7d38d108f8da8515e2f7706cd03b6585aab4d071 0060-set-disksup_posix_only-to-true.patch +400bcc630db8902e4781f9590c6d81089d7e6751a17c09ad1f05a0308fc6737391a718c73936b411e3b6bcbc65e5ea555d92012dacaa806a9db9cd219d887753 0070-hipe_x86_signal-fix.patch" diff --git a/main/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/main/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch deleted file mode 100644 index fef4a7ff98..0000000000 --- a/main/erlang/0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Peter Lemenkov -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 - ---- 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/main/erlang/0002-Remove-rpath.patch b/main/erlang/0002-Remove-rpath.patch deleted file mode 100644 index 71658fe396..0000000000 --- a/main/erlang/0002-Remove-rpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH] Remove rpath - -Signed-off-by: Peter Lemenkov - ---- 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/main/erlang/0003-Do-not-install-C-sources.patch b/main/erlang/0003-Do-not-install-C-sources.patch deleted file mode 100644 index 364c4ad790..0000000000 --- a/main/erlang/0003-Do-not-install-C-sources.patch +++ /dev/null @@ -1,143 +0,0 @@ -From: Peter Lemenkov -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 - ---- 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/main/erlang/0004-Do-not-install-Java-sources.patch b/main/erlang/0004-Do-not-install-Java-sources.patch deleted file mode 100644 index 799476c8c6..0000000000 --- a/main/erlang/0004-Do-not-install-Java-sources.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 19 Jun 2010 09:25:18 +0400 -Subject: [PATCH] Do not install Java sources - -Signed-off-by: Peter Lemenkov - ---- 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/main/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/main/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch deleted file mode 100644 index dcfa6bcfad..0000000000 --- a/main/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Peter Lemenkov -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 - ---- 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/main/erlang/0006-Do-not-install-erlang-sources.patch b/main/erlang/0006-Do-not-install-erlang-sources.patch deleted file mode 100644 index a79dbba5de..0000000000 --- a/main/erlang/0006-Do-not-install-erlang-sources.patch +++ /dev/null @@ -1,849 +0,0 @@ ---- otp_src_18.1-orig/erts/preloaded/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/asn1/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/common_test/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/compiler/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosEvent/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosEventDomain/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosFileTransfer/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosNotification/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosProperty/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosTime/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/cosTransactions/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/crypto/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/debugger/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/dialyzer/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/diameter/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/edoc/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/eldap/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/erl_docgen/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/et/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/eunit/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/gs/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/cerl/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/flow/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/icode/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/llvm/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/main/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/misc/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/rtl/Makefile -+++ otp_src_18.1-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.1-orig/lib/hipe/util/Makefile -+++ otp_src_18.1-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.1-orig/lib/ic/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/inets/src/ftp/Makefile -+++ otp_src_18.1-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.1-orig/lib/inets/src/http_client/Makefile -+++ otp_src_18.1-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.1-orig/lib/inets/src/http_lib/Makefile -+++ otp_src_18.1-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.1-orig/lib/inets/src/http_server/Makefile -+++ otp_src_18.1-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.1-orig/lib/inets/src/inets_app/Makefile -+++ otp_src_18.1-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.1-orig/lib/inets/src/tftp/Makefile -+++ otp_src_18.1-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.1-orig/lib/kernel/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/megaco/src/app/Makefile -+++ otp_src_18.1-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.1-orig/lib/megaco/src/binary/Makefile -+++ otp_src_18.1-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.1-orig/lib/megaco/src/engine/Makefile -+++ otp_src_18.1-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.1-orig/lib/megaco/src/flex/Makefile.in -+++ otp_src_18.1-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.1-orig/lib/megaco/src/tcp/Makefile -+++ otp_src_18.1-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.1-orig/lib/megaco/src/text/Makefile -+++ otp_src_18.1-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.1-orig/lib/megaco/src/udp/Makefile -+++ otp_src_18.1-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.1-orig/lib/mnesia/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/observer/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/odbc/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/orber/COSS/CosNaming/Makefile -+++ otp_src_18.1-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.1-orig/lib/orber/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/os_mon/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/ose/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/otp_mibs/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/parsetools/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/percept/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/public_key/asn1/Makefile -+++ otp_src_18.1-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.1-orig/lib/public_key/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/reltool/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/runtime_tools/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/sasl/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/snmp/src/agent/Makefile -+++ otp_src_18.1-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.1-orig/lib/snmp/src/app/Makefile -+++ otp_src_18.1-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.1-orig/lib/snmp/src/compile/Makefile -+++ otp_src_18.1-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.1-orig/lib/snmp/src/manager/Makefile -+++ otp_src_18.1-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.1-orig/lib/snmp/src/misc/Makefile -+++ otp_src_18.1-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.1-orig/lib/ssh/src/Makefile -+++ otp_src_18.1-fixed/lib/ssh/src/Makefile -@@ -135,7 +135,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.1-orig/lib/ssl/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/stdlib/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/syntax_tools/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/test_server/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/tools/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/typer/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/webtool/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/wx/src/Makefile -+++ otp_src_18.1-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.1-orig/lib/xmerl/src/Makefile -+++ otp_src_18.1-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/main/erlang/0007-Split-off-webtool-dependency-from-tools.patch b/main/erlang/0007-Split-off-webtool-dependency-from-tools.patch deleted file mode 100644 index 6a58f5cea0..0000000000 --- a/main/erlang/0007-Split-off-webtool-dependency-from-tools.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 8 Nov 2014 22:54:57 +0300 -Subject: [PATCH] Split off webtool dependency from tools - -Signed-off-by: Peter Lemenkov - ---- 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/main/erlang/0010-fix-nteventlog-remove.patch b/main/erlang/0010-fix-nteventlog-remove.patch deleted file mode 100644 index c3d066bdfb..0000000000 --- a/main/erlang/0010-fix-nteventlog-remove.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_18.0/lib/os_mon/src/os_mon.app.src -+++ otp_src_18.0-fixed/lib/os_mon/src/os_mon.app.src -@@ -22,7 +22,7 @@ - [{description, "CPO CXC 138 46"}, - {vsn, "%VSN%"}, - {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/main/erlang/0020-remove-private-unit32.patch b/main/erlang/0020-remove-private-unit32.patch deleted file mode 100644 index ec01499571..0000000000 --- a/main/erlang/0020-remove-private-unit32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/main/erlang/0030-replace_glibc_check.patch b/main/erlang/0030-replace_glibc_check.patch deleted file mode 100644 index 5ae980492a..0000000000 --- a/main/erlang/0030-replace_glibc_check.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/main/erlang/0060-set-disksup_posix_only-to-true.patch b/main/erlang/0060-set-disksup_posix_only-to-true.patch deleted file mode 100644 index a32c60c200..0000000000 --- a/main/erlang/0060-set-disksup_posix_only-to-true.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- otp_src_18.0/lib/os_mon/src/disksup.erl -+++ otp_src_18.0-fixed/lib/os_mon/src/disksup.erl -@@ -87,7 +87,7 @@ - - param_default(disk_space_check_interval) -> 30; - param_default(disk_almost_full_threshold) -> 0.80; --param_default(disksup_posix_only) -> false. -+param_default(disksup_posix_only) -> true. - - %%---------------------------------------------------------------------- - %% gen_server callbacks ---- otp_src_18.0/lib/os_mon/test/disksup_SUITE.erl -+++ otp_src_18.0-fixed/lib/os_mon/test/disksup_SUITE.erl -@@ -337,7 +337,7 @@ - []; - restart(Config) when is_list(Config) -> - ok = application:set_env(os_mon, start_disksup, true), -- ok = application:set_env(os_mon, disksup_posix_only, false), -+ ok = application:set_env(os_mon, disksup_posix_only, true), - {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup), - ok. - diff --git a/main/erlang/0070-hipe_x86_signal-fix.patch b/main/erlang/0070-hipe_x86_signal-fix.patch deleted file mode 100644 index 728d47da55..0000000000 --- a/main/erlang/0070-hipe_x86_signal-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- otp_src_18.1-orig/erts/emulator/hipe/hipe_x86_signal.c -+++ otp_src_18.1-fixed/erts/emulator/hipe/hipe_x86_signal.c -@@ -221,16 +221,15 @@ - #include - static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*); - #define init_done() (__next_sigaction != 0) --#define __SIGACTION _sigaction -+#define __SIGACTION __sigaction - static void do_init(void) - { -- __next_sigaction = dlsym(RTLD_NEXT, "_sigaction"); -+ __next_sigaction = dlsym(RTLD_NEXT, "__sigaction"); - if (__next_sigaction != 0) - return; - perror("dlsym"); - abort(); - } --#define _NSIG NSIG - #define INIT() do { if (!init_done()) do_init(); } while (0) - #endif /* not glibc or darwin */ - diff --git a/main/erlang/APKBUILD b/main/erlang/APKBUILD deleted file mode 100644 index bffe6a8335..0000000000 --- a/main/erlang/APKBUILD +++ /dev/null @@ -1,252 +0,0 @@ -# Contributor: Michael Mason -# Maintainer: Marlus Saraiva - -pkgname=erlang -pkgver=18.1 -_srcver=18.1 -pkgrel=3 -pkgdesc="General-purpose programming language and runtime environment" -url="http://www.erlang.org/" -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" -install="" -subpackages="$pkgname-dev - $pkgname-asn1:asn - $pkgname-common-test:common_test - $pkgname-compiler:compiler - $pkgname-cosevent:cos_event - $pkgname-coseventdomain:cos_event_domain - $pkgname-cosfiletransfer:cos_file_transfer - $pkgname-cosnotification:cos_notification - $pkgname-cosproperty:cos_property - $pkgname-costime:cos_time - $pkgname-costransaction:cos_transactions - $pkgname-crypto:crypto - $pkgname-debugger:debugger - $pkgname-dialyzer:dialyzer - $pkgname-diameter:diameter - $pkgname-edoc:edoc - $pkgname-eldap:eldap - $pkgname-erl-docgen:erl_docgen - $pkgname-erl-interface:erl_interface - $pkgname-erts:erts - $pkgname-et:et - $pkgname-eunit:eunit - $pkgname-gs:gs - $pkgname-hipe:hipe - $pkgname-ic:ic - $pkgname-inets:inets - $pkgname-jinterface:jinterface - $pkgname-kernel:kernel - $pkgname-megaco:megaco - $pkgname-mnesia:mnesia - $pkgname-observer:observer - $pkgname-odbc:odbc - $pkgname-orber:orber - $pkgname-os-mon:os_mon - $pkgname-ose:ose - $pkgname-otp-mibs:otp_mibs - $pkgname-parsetools:parsetools - $pkgname-percept:percept - $pkgname-public-key:public_key - $pkgname-reltool:reltool - $pkgname-runtime-tools:runtime_tools - $pkgname-sasl:sasl - $pkgname-snmp:snmp - $pkgname-ssh:ssh - $pkgname-ssl:ssl - $pkgname-stdlib:stdlib - $pkgname-syntax-tools:syntax_tools - $pkgname-test-server:test_server - $pkgname-tools:tools - $pkgname-typer:typer - $pkgname-webtool:webtool - $pkgname-xmerl:xmerl" -# 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 - 0060-set-disksup_posix_only-to-true.patch - 0070-hipe_x86_signal-fix.patch" - -_builddir="$srcdir"/otp_src_$_srcver - -prepare() { - local i - cd "$_builddir" - rm lib/os_mon/ebin/* - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - export CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS" - export PATH="/usr/lib/jvm/java-1.7-openjdk/bin:$PATH" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --host="$CHOST" \ - --build="$CBUILD" \ - --enable-threads \ - --enable-shared-zlib \ - --enable-ssl=dynamic-ssl-lib \ - --disable-hipe \ - || return 1 - make -j1 || return 1 -} - -package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 - rm -rf "$pkgdir"/usr/lib/erlang/lib/wx-* -} - -_mv_erlang_lib() { - local lib=$1 - depends="$pkgname" - - mkdir -p "$subpkgdir"/usr/lib/erlang/lib - mv "$pkgdir"/usr/lib/erlang/lib/$lib-* "$subpkgdir"/usr/lib/erlang/lib/ -} - -asn() { _mv_erlang_lib asn1; } -common_test() { _mv_erlang_lib common_test; } -compiler() { _mv_erlang_lib compiler; } -cos_event() { _mv_erlang_lib cosEvent; } -cos_event_domain() { _mv_erlang_lib cosEventDomain; } -cos_file_transfer() { _mv_erlang_lib cosFileTransfer; } -cos_notification() { _mv_erlang_lib cosNotification; } -cos_property() { _mv_erlang_lib cosProperty; } -cos_time() { _mv_erlang_lib cosTime; } -cos_transactions() { _mv_erlang_lib cosTransactions; } -crypto() { _mv_erlang_lib crypto; } -debugger() { _mv_erlang_lib debugger; } -dialyzer() { _mv_erlang_lib dialyzer; } -diameter() { _mv_erlang_lib diameter; } -edoc() { _mv_erlang_lib edoc; } -eldap() { _mv_erlang_lib eldap; } -erl_docgen() { _mv_erlang_lib erl_docgen; } -erl_interface() { _mv_erlang_lib erl_interface; } -erts() { _mv_erlang_lib erts; } -et() { _mv_erlang_lib et; } -eunit() { _mv_erlang_lib eunit; } -gs() { _mv_erlang_lib gs; } -hipe() { _mv_erlang_lib hipe; } -ic() { _mv_erlang_lib ic; } -inets() { _mv_erlang_lib inets; } -jinterface() { _mv_erlang_lib jinterface; } -kernel() { _mv_erlang_lib kernel; } -megaco() { _mv_erlang_lib megaco; } -mnesia() { _mv_erlang_lib mnesia; } -observer() { _mv_erlang_lib observer; } -odbc() { _mv_erlang_lib odbc; } -orber() { _mv_erlang_lib orber; } -os_mon() { _mv_erlang_lib os_mon; } -ose() { _mv_erlang_lib ose; } -otp_mibs() { _mv_erlang_lib otp_mibs; } -parsetools() { _mv_erlang_lib parsetools; } -percept() { _mv_erlang_lib percept; } -public_key() { _mv_erlang_lib public_key; } -reltool() { _mv_erlang_lib reltool; } -runtime_tools() { _mv_erlang_lib runtime_tools; } -sasl() { _mv_erlang_lib sasl; } -snmp() { _mv_erlang_lib snmp; } -ssh() { _mv_erlang_lib ssh; } -ssl() { _mv_erlang_lib ssl; } -stdlib() { _mv_erlang_lib stdlib; } -syntax_tools() { _mv_erlang_lib syntax_tools; } -test_server() { _mv_erlang_lib test_server; } -tools() { _mv_erlang_lib tools; } -typer() { _mv_erlang_lib typer; } -webtool() { _mv_erlang_lib webtool; } -xmerl() { _mv_erlang_lib xmerl; } - -dev() { - local i= j= - depends="$pkgname=$pkgver-r$pkgrel $depends_dev" - pkgdesc="$pkgdesc (development files)" - - cd "$pkgdir" || return 0 - local libdirs=usr/ - [ -d lib/ ] && libdirs="lib/ $libdirs" - for i in usr/include usr/lib/pkgconfig usr/share/aclocal\ - usr/share/gettext usr/bin/*-config \ - usr/share/vala/vapi usr/share/gir-[0-9]*\ - usr/share/qt*/mkspecs \ - usr/lib/qt*/mkspecs \ - usr/lib/cmake \ - $(find . -name include -type d) \ - $(find $libdirs -name '*.[acho]' \ - -o -name '*.prl' 2>/dev/null); do - if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then - d="$subpkgdir/${i%/*}" # dirname $i - mkdir -p "$d" - mv "$pkgdir/$i" "$d" - rmdir "$pkgdir/${i%/*}" 2>/dev/null - fi - done - # move *.so links needed when linking the apps to -dev packages - for i in lib/*.so usr/lib/*.so; do - if [ -L "$i" ]; then - mkdir -p "$subpkgdir"/"${i%/*}" - mv "$i" "$subpkgdir/$i" || return 1 - fi - done - return 0 -} - - -md5sums="fa64015fdd133e155b5b19bf90ac8678 otp_src_18.1.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 -90f36608d2d8f71c8eb19126af06978b 0006-Do-not-install-erlang-sources.patch -b438c37818b5c82443682c3693dd7e53 0007-Split-off-webtool-dependency-from-tools.patch -0dd300003ff68fc46dc3c839c2541d53 0010-fix-nteventlog-remove.patch -062605d7f01f4685f1897ba2decc23a8 0020-remove-private-unit32.patch -7a5c956b7bf79e34a0f980d1e2a65bee 0030-replace_glibc_check.patch -d17fbaafa9f7820ade09b239c00aede6 0060-set-disksup_posix_only-to-true.patch -02a18c698b0ff37d0bcf106db57c1136 0070-hipe_x86_signal-fix.patch" -sha256sums="e4a147228a6b7fa60dce05c8adfb3cbc254d97cf6e45456d93d93adbde8b0f11 otp_src_18.1.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 -594745af27e73d8213e190eea654285bc4bdda706de4275f2b6dd64b2af720c3 0006-Do-not-install-erlang-sources.patch -9704a53bc4bd6f5624f9ce3f201128204011f4579f19b547df74d92ae22777cf 0007-Split-off-webtool-dependency-from-tools.patch -019c62ea3fee60068caa8c3152d7f96e76591fc5dc096abfcea48ec1593eb758 0010-fix-nteventlog-remove.patch -0b63ff5ce4e642d4225d5cc4d52d88dd5daf83ce5a2549ba0e5a14ce05e17ac2 0020-remove-private-unit32.patch -e3158dbb4bcb4677ceda39a374326c069de78a52e598ef8169a288b86a040a62 0030-replace_glibc_check.patch -3ffda0b3acbde755b496c1a974c20e1ca580432c403944c1c16836f48e248429 0060-set-disksup_posix_only-to-true.patch -97c430677f18f81bafc6af7bb45c5dddc5222597350a6813cb338d21acec464a 0070-hipe_x86_signal-fix.patch" -sha512sums="31e3a4f3d8da7877757fa4df427c59462cb68e0177f93698146ce17127406fd0ee77f819044cef10e4a18ed075deb44343d915148cf1fd4bce09a1e39edaaee6 otp_src_18.1.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 -b9aea9344703688ef5b98d530417c59166749de4f6d91fe8d01abaa7bd1946495ec4ab23e854947192659f49b35cbbead7c4f47836c3579ff844f23217e75cb4 0006-Do-not-install-erlang-sources.patch -d65fcfc3a9441941c6292c33d354964a82da11cc7a411dd0440719e490075ed588c1e70690e80650561749010d737394567f12ff73bd460f0d00c792c77cfae3 0007-Split-off-webtool-dependency-from-tools.patch -b7387f92f8c27a0565c7885bba4b357183c62d422616e073bc5ffad338a0e22cb5165dcb3b95bf0b920ba00831599f2216027883f4be255aa6f6150b68b7a37c 0010-fix-nteventlog-remove.patch -18f70c3a99ac8c44bc9d90dc3f0c072ad4df4ffe57a8d0677087c9e940ba138d7a7698d5cdbbe14875a6012d353a679fdb33d40fca3a3211f712af8c4b0cb0b4 0020-remove-private-unit32.patch -b554882bee1a70322cc8c5b973986047deaf4528fe1371df39cf72b27b2497a859463bdf8847ea6ea96cb0caaa6bd143c96a5dee28839164a547a66a30fcffd0 0030-replace_glibc_check.patch -f3c50f8610e08173c365a575737079b0259db6fc0dfa5b1be63c281b52358bbce9e2595132a8f6a06772785d7d38d108f8da8515e2f7706cd03b6585aab4d071 0060-set-disksup_posix_only-to-true.patch -400bcc630db8902e4781f9590c6d81089d7e6751a17c09ad1f05a0308fc6737391a718c73936b411e3b6bcbc65e5ea555d92012dacaa806a9db9cd219d887753 0070-hipe_x86_signal-fix.patch" -- cgit v1.2.3