From f1b58dd8e5d3e1d47a71f7c74ad698d4fa89b021 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mar 21 2011 16:00:11 +0000 Subject: Merge branch 'R14B02' for NVR of erlang-R14B-02.1 * R14B02: snmp-4.19 (R14B02) ships lib/snmp/bin/snmpc inets-5.5.2 puts *.hrl in include/ install/symlink *.jar into %{_javadir} (#679031) Update to upstream maintenance release R14B02 --- diff --git a/erlang.spec b/erlang.spec index 94e3bf8..037e084 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ %global upstream_ver R14B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -%global upstream_rel 01 +%global upstream_rel 02 #global upstream_rel %{nil} # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -17,7 +17,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.5%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -29,6 +29,7 @@ Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}. Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.tar.gz %endif + # For the source of the Fedora specific patches, see the respective # branch at https://github.com/lemenkov/otp # @@ -41,7 +42,7 @@ Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.t # to get yourself a copy of the Erlang/OTP source code with the # Fedora specific patches from Peter Lemenkov and Hans Ulrich Niedermann. # Then run something like -# $ ./otp-get-patches.sh /path/to/otp OTP_R14B01 ndim/fedora-R14B01 +# $ ./otp-get-patches.sh /path/to/otp OTP_R14B02 ndim/fedora-R14B02 # for some semi-automatic patch update assistance. # # start of autogenerated patch tag list @@ -61,8 +62,8 @@ Patch4: otp-0004-Do-not-install-C-sources.patch # Do not install Java sources Patch5: otp-0005-Do-not-install-Java-sources.patch # Fedora specific patch -# Do not install info files - they are almost empty and useless -Patch6: otp-0006-Do-not-install-info-files-they-are-almost-empty-and-.patch +# Fix install dir typo for snmp man3 +Patch6: otp-0006-Fix-install-dir-typo-for-snmp-man3.patch # Fedora specific patch # Do not install nteventlog and related doc-files on non-win32 systems Patch7: otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -79,11 +80,8 @@ Patch10: otp-0010-Do-not-install-erlang-sources.patch # Ugly workaround for java-1.5.0-gcj which doesn't support UNICODE fully Patch11: otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch # Fedora specific patch -# Remove strange name field in efile_drv.c as it upsets -D_FORTIFY_SOURCE -Patch12: otp-0012-Remove-strange-name-field-in-efile_drv.c-as-it-upset.patch -# Fedora specific patch # Remove rpath from esock_ssl -Patch13: otp-0013-Remove-rpath-from-esock_ssl.patch +Patch12: otp-0012-Remove-rpath-from-esock_ssl.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -975,7 +973,7 @@ Erlang mode for XEmacs (source lisp files). %patch3 -p1 -b .Fix_for_dlopening_libGL_and_libGLU %patch4 -p1 -b .Do_not_install_C_sources %patch5 -p1 -b .Do_not_install_Java_sources -%patch6 -p1 -b .Do_not_install_info_files_they_are_almost_empty_and_ +%patch6 -p1 -b .Fix_install_dir_typo_for_snmp_man3 %patch7 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch8 -p1 -b .Do_not_install_bat_files_on_non_win32_machines %patch9 -p1 -b .Do_not_install_VxWorks_specific_docs @@ -985,8 +983,7 @@ Erlang mode for XEmacs (source lisp files). %patch11 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif -%patch12 -p1 -b .Remove_strange_name_field_in_efile_drv_c_as_it_upset -%patch13 -p1 -b .Remove_rpath_from_esock_ssl +%patch12 -p1 -b .Remove_rpath_from_esock_ssl # end of autogenerated prep patch list # remove shipped zlib sources @@ -1102,6 +1099,9 @@ env ERL_LIBS="$RPM_BUILD_ROOT%{_libdir}/erlang/lib" make DESTDIR=$RPM_BUILD_ROOT %endif %endif +# Do not install info files - they are almost empty and useless +find $RPM_BUILD_ROOT%{_libdir}/erlang -type f -name info -exec rm -f {} \; + # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 | xargs chmod 755 find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 | xargs chmod 755 @@ -1154,6 +1154,20 @@ do fi done +# symlink *.jar files to appropriate places for subpackages +install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}/%{name}" + +# erlang-ic +ic_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/ | sed "s,^$RPM_BUILD_ROOT,,")" +test -d "$RPM_BUILD_ROOT$ic_lib_dir" +ln -s "${ic_lib_dir}/priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" + +# erlang-jinterface +jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" +test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" +install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}" +ln -s "${jinterface_lib_dir}/priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" + %clean rm -rf $RPM_BUILD_ROOT @@ -1550,6 +1564,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +%{_javadir}/%{name}/ic.jar %if %{with doc} %{_libdir}/erlang/man/man3/ic.* %{_libdir}/erlang/man/man3/ic_clib.* @@ -1560,6 +1575,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin +%{_libdir}/erlang/lib/inets-*/include %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src %if %{with doc} @@ -1592,6 +1608,7 @@ rm -rf $RPM_BUILD_ROOT %files jinterface %defattr(-,root,root) %{_libdir}/erlang/lib/jinterface-*/ +%{_javadir}/%{name}/OtpErlang.jar %files kernel %defattr(-,root,root) @@ -1802,6 +1819,7 @@ rm -rf $RPM_BUILD_ROOT %files snmp %defattr(-,root,root) %dir %{_libdir}/erlang/lib/snmp-*/ +%{_libdir}/erlang/lib/snmp-*/bin %{_libdir}/erlang/lib/snmp-*/ebin %{_libdir}/erlang/lib/snmp-*/include %{_libdir}/erlang/lib/snmp-*/mibs @@ -2290,6 +2308,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 21 2011 Hans Ulrich Niedermann - R14B-02.1 +- snmp-4.19 (R14B02) ships lib/snmp/bin/snmpc +- inets-5.5.2 puts *.hrl in include/ +- install/symlink *.jar into %%{_javadir} (#679031) +- Update to upstream maintenance release R14B02 + * Sat Feb 12 2011 Hans Ulrich Niedermann - R14B-01.5 - erlang-doc does not really require erlang base package (#629723) - Add %%{?_isa} for all explicit "Requires:" diff --git a/otp-0006-Do-not-install-info-files-they-are-almost-empty-and-.patch b/otp-0006-Do-not-install-info-files-they-are-almost-empty-and-.patch deleted file mode 100644 index 6f6914e..0000000 --- a/otp-0006-Do-not-install-info-files-they-are-almost-empty-and-.patch +++ /dev/null @@ -1,1955 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 19 Jun 2010 09:29:12 +0400 -Subject: [PATCH] Do not install info files - they are almost empty and useless - -Signed-off-by: Peter Lemenkov ---- - erts/doc/src/Makefile | 9 +-------- - erts/info.src | 3 --- - lib/appmon/doc/src/Makefile | 3 --- - lib/appmon/info | 5 ----- - lib/asn1/doc/src/Makefile | 3 --- - lib/asn1/info | 2 -- - lib/common_test/doc/src/Makefile | 3 --- - lib/common_test/info | 2 -- - lib/compiler/doc/src/Makefile | 3 --- - lib/compiler/info | 3 --- - lib/cosEvent/doc/src/Makefile | 3 --- - lib/cosEvent/info | 2 -- - lib/cosEvent/src/Makefile | 1 - - lib/cosEventDomain/doc/src/Makefile | 3 --- - lib/cosEventDomain/info | 2 -- - lib/cosEventDomain/src/Makefile | 1 - - lib/cosFileTransfer/doc/src/Makefile | 4 ---- - lib/cosFileTransfer/info | 3 --- - lib/cosNotification/doc/src/Makefile | 3 --- - lib/cosNotification/info | 3 --- - lib/cosProperty/doc/src/Makefile | 4 ---- - lib/cosProperty/info | 2 -- - lib/cosTime/doc/src/Makefile | 3 --- - lib/cosTime/info | 12 ------------ - lib/cosTransactions/doc/src/Makefile | 3 --- - lib/cosTransactions/info | 2 -- - lib/crypto/doc/src/Makefile | 3 --- - lib/crypto/info | 2 -- - lib/debugger/doc/src/Makefile | 3 --- - lib/debugger/info | 2 -- - lib/dialyzer/doc/src/Makefile | 3 --- - lib/dialyzer/info | 2 -- - lib/docbuilder/doc/src/Makefile | 3 --- - lib/docbuilder/info | 2 -- - lib/edoc/doc/Makefile | 2 -- - lib/edoc/doc/src/Makefile | 3 --- - lib/edoc/info | 3 --- - lib/erl_interface/doc/src/Makefile | 3 --- - lib/erl_interface/info | 2 -- - lib/et/doc/src/Makefile | 3 --- - lib/et/info | 4 ---- - lib/eunit/doc/src/Makefile | 3 --- - lib/eunit/info | 2 -- - lib/gs/doc/src/Makefile | 3 --- - lib/gs/info | 2 -- - lib/hipe/doc/src/Makefile | 2 -- - lib/hipe/info | 2 -- - lib/ic/doc/src/Makefile | 3 --- - lib/ic/info | 2 -- - lib/inets/doc/src/Makefile | 3 --- - lib/inets/info | 2 -- - lib/inviso/doc/src/Makefile | 3 --- - lib/inviso/info | 2 -- - lib/jinterface/doc/src/Makefile | 2 -- - lib/jinterface/info | 2 -- - lib/kernel/doc/src/Makefile | 3 --- - lib/kernel/info | 2 -- - lib/megaco/doc/src/Makefile | 4 ---- - lib/megaco/info | 5 ----- - lib/mnesia/doc/src/Makefile | 3 --- - lib/mnesia/info | 2 -- - lib/observer/doc/src/Makefile | 3 --- - lib/observer/info | 2 -- - lib/odbc/doc/src/Makefile | 3 --- - lib/odbc/info | 3 --- - lib/orber/doc/src/Makefile | 3 --- - lib/orber/info | 2 -- - lib/os_mon/doc/src/Makefile | 3 --- - lib/os_mon/info | 3 --- - lib/otp_mibs/doc/src/Makefile | 3 --- - lib/otp_mibs/info | 2 -- - lib/parsetools/doc/src/Makefile | 3 --- - lib/parsetools/info | 2 -- - lib/percept/doc/src/Makefile | 3 --- - lib/percept/info | 2 -- - lib/pman/doc/src/Makefile | 3 --- - lib/pman/info | 2 -- - lib/public_key/doc/src/Makefile | 4 ---- - lib/public_key/info | 2 -- - lib/reltool/doc/src/Makefile | 3 --- - lib/reltool/info | 7 ------- - lib/runtime_tools/doc/src/Makefile | 3 --- - lib/runtime_tools/info | 2 -- - lib/sasl/doc/src/Makefile | 3 --- - lib/sasl/info | 3 --- - lib/snmp/doc/src/Makefile | 4 ---- - lib/snmp/info | 3 --- - lib/ssh/doc/src/Makefile | 3 --- - lib/ssh/info | 2 -- - lib/ssl/doc/src/Makefile | 2 -- - lib/ssl/info | 2 -- - lib/stdlib/doc/src/Makefile | 3 --- - lib/stdlib/info | 2 -- - lib/syntax_tools/doc/Makefile | 2 -- - lib/syntax_tools/doc/src/Makefile | 3 --- - lib/syntax_tools/info | 3 --- - lib/test_server/doc/src/Makefile | 3 --- - lib/test_server/info | 2 -- - lib/toolbar/doc/src/Makefile | 3 --- - lib/toolbar/info | 2 -- - lib/tools/doc/src/Makefile | 3 --- - lib/tools/info | 2 -- - lib/tv/doc/src/Makefile | 3 --- - lib/tv/info | 2 -- - lib/webtool/doc/src/Makefile | 3 --- - lib/webtool/info | 2 -- - lib/wx/doc/src/Makefile | 3 --- - lib/wx/info | 2 -- - lib/xmerl/doc/src/Makefile | 3 --- - lib/xmerl/info | 2 -- - 110 files changed, 1 insertions(+), 311 deletions(-) - delete mode 100644 erts/info.src - delete mode 100644 lib/appmon/info - delete mode 100644 lib/asn1/info - delete mode 100644 lib/common_test/info - delete mode 100644 lib/compiler/info - delete mode 100644 lib/cosEvent/info - delete mode 100644 lib/cosEventDomain/info - delete mode 100644 lib/cosFileTransfer/info - delete mode 100644 lib/cosNotification/info - delete mode 100644 lib/cosProperty/info - delete mode 100644 lib/cosTime/info - delete mode 100644 lib/cosTransactions/info - delete mode 100644 lib/crypto/info - delete mode 100644 lib/debugger/info - delete mode 100755 lib/dialyzer/info - delete mode 100644 lib/docbuilder/info - delete mode 100644 lib/edoc/info - delete mode 100644 lib/erl_interface/info - delete mode 100644 lib/et/info - delete mode 100644 lib/eunit/info - delete mode 100644 lib/gs/info - delete mode 100644 lib/hipe/info - delete mode 100644 lib/ic/info - delete mode 100644 lib/inets/info - delete mode 100644 lib/inviso/info - delete mode 100644 lib/jinterface/info - delete mode 100644 lib/kernel/info - delete mode 100644 lib/megaco/info - delete mode 100644 lib/mnesia/info - delete mode 100644 lib/observer/info - delete mode 100644 lib/odbc/info - delete mode 100644 lib/orber/info - delete mode 100644 lib/os_mon/info - delete mode 100644 lib/otp_mibs/info - delete mode 100644 lib/parsetools/info - delete mode 100644 lib/percept/info - delete mode 100644 lib/pman/info - delete mode 100644 lib/public_key/info - delete mode 100644 lib/reltool/info - delete mode 100644 lib/runtime_tools/info - delete mode 100644 lib/sasl/info - delete mode 100644 lib/snmp/info - delete mode 100644 lib/ssh/info - delete mode 100644 lib/ssl/info - delete mode 100644 lib/stdlib/info - delete mode 100644 lib/syntax_tools/info - delete mode 100644 lib/test_server/info - delete mode 100644 lib/toolbar/info - delete mode 100644 lib/tools/info - delete mode 100644 lib/tv/info - delete mode 100644 lib/webtool/info - delete mode 100644 lib/wx/info - delete mode 100644 lib/xmerl/info - -diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile -index 6578923..be99288 100644 ---- a/erts/doc/src/Makefile -+++ b/erts/doc/src/Makefile -@@ -88,9 +88,6 @@ XML_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info --INFO_FILE_SRC = ../../info.src -- - MAN1_FILES = $(XML_REF1_FILES:%.xml=$(MAN1DIR)/%.1) - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - -@@ -109,7 +106,7 @@ XML_FLAGS += - $(HTMLDIR)/%.gif: %.gif - $(INSTALL_DATA) $< $@ - --docs: pdf html man $(INFO_FILE) -+docs: pdf html man - - $(TOP_PDF_FILE): $(XML_FILES) - -@@ -121,9 +118,6 @@ man: $(MAN1_FILES) $(MAN3_FILES) - - gifs: $(GIF_FILES:%=$(HTMLDIR)/%) - --$(INFO_FILE): $(INFO_FILE_SRC) ../../vsn.mk -- sed -e 's;%RELEASE%;$(SYSTEM_VSN);' $(INFO_FILE_SRC) > $(INFO_FILE) -- - - debug opt: - -@@ -145,7 +139,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man1 -diff --git a/erts/info.src b/erts/info.src -deleted file mode 100644 -index 6e295a6..0000000 ---- a/erts/info.src -+++ /dev/null -@@ -1,3 +0,0 @@ --group: basic --short: Functionality necessary to run the Erlang System itself --release: %RELEASE% -diff --git a/lib/appmon/doc/src/Makefile b/lib/appmon/doc/src/Makefile -index 743f123..46ee19f 100644 ---- a/lib/appmon/doc/src/Makefile -+++ b/lib/appmon/doc/src/Makefile -@@ -61,8 +61,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -112,7 +110,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/appmon/info b/lib/appmon/info -deleted file mode 100644 -index c33a50d..0000000 ---- a/lib/appmon/info -+++ /dev/null -@@ -1,5 +0,0 @@ --group: tools --short: A utility used to supervise Applications executing on several --short: Erlang nodes -- -- -diff --git a/lib/asn1/doc/src/Makefile b/lib/asn1/doc/src/Makefile -index d29225f..04dc5d1 100644 ---- a/lib/asn1/doc/src/Makefile -+++ b/lib/asn1/doc/src/Makefile -@@ -77,7 +77,6 @@ ASN1_FILES = \ - Seq.asn \ - Seq.asn1config - --INFO_FILE = ../../info - EXTRA_FILES = \ - $(DEFAULT_HTML_FILES) \ - $(ASN1_FILES) \ -@@ -187,7 +186,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -@@ -207,7 +205,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(HTML_APPHISTORY) $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - endif -diff --git a/lib/asn1/info b/lib/asn1/info -deleted file mode 100644 -index e20b398..0000000 ---- a/lib/asn1/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: Provides support for Abstract Syntax Notation One -diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile -index 1a767a8..0d9caa2 100644 ---- a/lib/common_test/doc/src/Makefile -+++ b/lib/common_test/doc/src/Makefile -@@ -91,8 +91,6 @@ XML_FILES=$(XML_APPLICATION_FILES) $(XML_REF1_FILES) $(XML_REF3_FILES) $(XML_RE - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN1_FILES = $(XML_REF1_FILES:%.xml=$(MAN1DIR)/%.1) - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) -@@ -164,7 +162,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man1 - $(INSTALL_DATA) $(MAN1DIR)/* $(RELEASE_PATH)/man/man1 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 -diff --git a/lib/common_test/info b/lib/common_test/info -deleted file mode 100644 -index 6b2778f..0000000 ---- a/lib/common_test/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: test --short: A portable framework for automatic testing -diff --git a/lib/compiler/doc/src/Makefile b/lib/compiler/doc/src/Makefile -index ee41a70..266e024 100644 ---- a/lib/compiler/doc/src/Makefile -+++ b/lib/compiler/doc/src/Makefile -@@ -54,8 +54,6 @@ XML_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -104,7 +102,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/compiler/info b/lib/compiler/info -deleted file mode 100644 -index 2005abd..0000000 ---- a/lib/compiler/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: basic --short: A byte code compiler for Erlang which produces highly compact --short: code -diff --git a/lib/cosEvent/doc/src/Makefile b/lib/cosEvent/doc/src/Makefile -index 4b76a64..e3a1ad1 100644 ---- a/lib/cosEvent/doc/src/Makefile -+++ b/lib/cosEvent/doc/src/Makefile -@@ -89,7 +89,6 @@ INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -200,7 +199,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -@@ -220,7 +218,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosEvent/info b/lib/cosEvent/info -deleted file mode 100644 -index dc9f7b7..0000000 ---- a/lib/cosEvent/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: orb --short: Orber OMG Event Service -diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index a62d47c..ba6e2b1 100644 ---- a/lib/cosEvent/src/Makefile -+++ b/lib/cosEvent/src/Makefile -@@ -196,7 +196,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR) -- $(INSTALL_DATA) ../info $(RELSYSDIR) - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -diff --git a/lib/cosEventDomain/doc/src/Makefile b/lib/cosEventDomain/doc/src/Makefile -index 6a0d3c3..9f03ad1 100644 ---- a/lib/cosEventDomain/doc/src/Makefile -+++ b/lib/cosEventDomain/doc/src/Makefile -@@ -84,7 +84,6 @@ INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -198,7 +197,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -217,7 +215,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosEventDomain/info b/lib/cosEventDomain/info -deleted file mode 100644 -index 46ecf95..0000000 ---- a/lib/cosEventDomain/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: orb --short: Orber OMG Event Domain Service -diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index 56a67cd..884c8f1 100644 ---- a/lib/cosEventDomain/src/Makefile -+++ b/lib/cosEventDomain/src/Makefile -@@ -162,7 +162,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR) -- $(INSTALL_DATA) ../info $(RELSYSDIR) - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -diff --git a/lib/cosFileTransfer/doc/src/Makefile b/lib/cosFileTransfer/doc/src/Makefile -index 2286db4..e03991f 100644 ---- a/lib/cosFileTransfer/doc/src/Makefile -+++ b/lib/cosFileTransfer/doc/src/Makefile -@@ -88,8 +88,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - - --INFO_FILE = ../../info -- - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -201,7 +199,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -220,7 +217,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosFileTransfer/info b/lib/cosFileTransfer/info -deleted file mode 100644 -index e5ca860..0000000 ---- a/lib/cosFileTransfer/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: orb --short: Orber OMG File Transfer Service -- -diff --git a/lib/cosNotification/doc/src/Makefile b/lib/cosNotification/doc/src/Makefile -index bfdd2f1..e6a704e 100644 ---- a/lib/cosNotification/doc/src/Makefile -+++ b/lib/cosNotification/doc/src/Makefile -@@ -113,7 +113,6 @@ INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -225,7 +224,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -244,7 +242,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosNotification/info b/lib/cosNotification/info -deleted file mode 100644 -index 1b634eb..0000000 ---- a/lib/cosNotification/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: orb --short: Orber OMG Notification Service -- -diff --git a/lib/cosProperty/doc/src/Makefile b/lib/cosProperty/doc/src/Makefile -index baf995d..1a8b47b 100644 ---- a/lib/cosProperty/doc/src/Makefile -+++ b/lib/cosProperty/doc/src/Makefile -@@ -87,8 +87,6 @@ INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -214,7 +212,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -233,7 +230,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosProperty/info b/lib/cosProperty/info -deleted file mode 100644 -index 67c56e9..0000000 ---- a/lib/cosProperty/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: orb --short: Orber OMG Property Service -diff --git a/lib/cosTime/doc/src/Makefile b/lib/cosTime/doc/src/Makefile -index 83abc5e..4927437 100644 ---- a/lib/cosTime/doc/src/Makefile -+++ b/lib/cosTime/doc/src/Makefile -@@ -84,7 +84,6 @@ INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -196,7 +195,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -215,7 +213,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosTime/info b/lib/cosTime/info -deleted file mode 100644 -index 7820f3f..0000000 ---- a/lib/cosTime/info -+++ /dev/null -@@ -1,12 +0,0 @@ --group: orb --short: Orber OMG Timer and TimerEvent Services -- -- -- -- -- -- -- -- -- -- -diff --git a/lib/cosTransactions/doc/src/Makefile b/lib/cosTransactions/doc/src/Makefile -index 1af9ed2..48c7c7c 100644 ---- a/lib/cosTransactions/doc/src/Makefile -+++ b/lib/cosTransactions/doc/src/Makefile -@@ -88,7 +88,6 @@ INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -200,7 +199,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -219,7 +217,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/cosTransactions/info b/lib/cosTransactions/info -deleted file mode 100644 -index e5d7c53..0000000 ---- a/lib/cosTransactions/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: orb --short: Orber OMG Transaction Service -diff --git a/lib/crypto/doc/src/Makefile b/lib/crypto/doc/src/Makefile -index 03aaba9..a504821 100644 ---- a/lib/crypto/doc/src/Makefile -+++ b/lib/crypto/doc/src/Makefile -@@ -52,8 +52,6 @@ GIF_FILES = - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) - -@@ -105,7 +103,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/crypto/info b/lib/crypto/info -deleted file mode 100644 -index bb73f01..0000000 ---- a/lib/crypto/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: Cryptographical support -diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile -index 1c0bbaf..064d167 100644 ---- a/lib/debugger/doc/src/Makefile -+++ b/lib/debugger/doc/src/Makefile -@@ -62,8 +62,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -114,7 +112,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - (/bin/cp -rf $(HTMLDIR) $(RELSYSDIR)/doc) -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/debugger/info b/lib/debugger/info -deleted file mode 100644 -index 3a69a15..0000000 ---- a/lib/debugger/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A debugger for debugging and testing of Erlang programs -diff --git a/lib/dialyzer/doc/src/Makefile b/lib/dialyzer/doc/src/Makefile -index 45b0ffa..3590523 100755 ---- a/lib/dialyzer/doc/src/Makefile -+++ b/lib/dialyzer/doc/src/Makefile -@@ -55,8 +55,6 @@ TEXT_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -105,7 +103,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/dialyzer/info b/lib/dialyzer/info -deleted file mode 100755 -index 9fba4b5..0000000 ---- a/lib/dialyzer/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: The DIALYZER, a DIscrepany AnaLYZer for ERlang programs. -diff --git a/lib/docbuilder/doc/src/Makefile b/lib/docbuilder/doc/src/Makefile -index ae34266..1abbae6 100644 ---- a/lib/docbuilder/doc/src/Makefile -+++ b/lib/docbuilder/doc/src/Makefile -@@ -71,8 +71,6 @@ HTML_FILES = \ - $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) - -@@ -123,7 +121,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/docbuilder/info b/lib/docbuilder/info -deleted file mode 100644 -index 60daa21..0000000 ---- a/lib/docbuilder/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: doc --short: Tool for generating HTML documentation for applications. -diff --git a/lib/edoc/doc/Makefile b/lib/edoc/doc/Makefile -index a0f6484..b276ab8 100644 ---- a/lib/edoc/doc/Makefile -+++ b/lib/edoc/doc/Makefile -@@ -37,7 +37,6 @@ APPNAME=edoc - DOC_TITLE="Welcome to EDoc" - - HTML_FILES = *.html --INFO_FILE = ../info - # ---------------------------------------------------- - # Target Specs - # ---------------------------------------------------- -@@ -76,7 +75,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTML_FILES) $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - - - release_spec: -diff --git a/lib/edoc/doc/src/Makefile b/lib/edoc/doc/src/Makefile -index 748691d..26f7b74 100644 ---- a/lib/edoc/doc/src/Makefile -+++ b/lib/edoc/doc/src/Makefile -@@ -60,8 +60,6 @@ XML_FILES=\ - $(XML_NOTES_FILES) - - # ---------------------------------------------------- --INFO_FILE = ../../info -- - HTML_FILES = \ - $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) -@@ -131,7 +129,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/edoc/info b/lib/edoc/info -deleted file mode 100644 -index bc52caa..0000000 ---- a/lib/edoc/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: doc Documentation Applications --short: A utility used to generate documentation out of tags in source files. -- -diff --git a/lib/erl_interface/doc/src/Makefile b/lib/erl_interface/doc/src/Makefile -index e05b647..98b0fe5 100644 ---- a/lib/erl_interface/doc/src/Makefile -+++ b/lib/erl_interface/doc/src/Makefile -@@ -63,8 +63,6 @@ XML_FILES = $(XML_REF1_FILES) $(XML_REF3_FILES) $(BOOK_FILES) \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - GIF_FILES = - - MAN1_FILES = $(XML_REF1_FILES:%.xml=$(MAN1DIR)/%.1) -@@ -118,7 +116,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man1 - $(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 -diff --git a/lib/erl_interface/info b/lib/erl_interface/info -deleted file mode 100644 -index 9612b0b..0000000 ---- a/lib/erl_interface/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm Interface and Communication Applications --short: Low level interface to C -diff --git a/lib/et/doc/src/Makefile b/lib/et/doc/src/Makefile -index 6bb8164..3fb9e49 100644 ---- a/lib/et/doc/src/Makefile -+++ b/lib/et/doc/src/Makefile -@@ -47,8 +47,6 @@ XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -102,7 +100,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/et/info b/lib/et/info -deleted file mode 100644 -index 984e427..0000000 ---- a/lib/et/info -+++ /dev/null -@@ -1,4 +0,0 @@ --group: tools --short: Event Tracer (ET), uses the built-in trace mechanism in --short: Erlang and provides tools for collection and graphical --short: viewing of trace data. -diff --git a/lib/eunit/doc/src/Makefile b/lib/eunit/doc/src/Makefile -index 2cdc579..4a952eb 100644 ---- a/lib/eunit/doc/src/Makefile -+++ b/lib/eunit/doc/src/Makefile -@@ -75,8 +75,6 @@ XML_FILES = \ - - - # ---------------------------------------------------- --INFO_FILE = ../../info -- - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - -@@ -162,7 +160,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/eunit/info b/lib/eunit/info -deleted file mode 100644 -index e7e6265..0000000 ---- a/lib/eunit/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: test --short: Support for unit testing. -diff --git a/lib/gs/doc/src/Makefile b/lib/gs/doc/src/Makefile -index 192dd67..9f754bc 100644 ---- a/lib/gs/doc/src/Makefile -+++ b/lib/gs/doc/src/Makefile -@@ -97,8 +97,6 @@ GIF_FILES = images/arc.gif \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -148,7 +146,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - (/bin/cp -rf $(HTMLDIR) $(RELSYSDIR)/doc) -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/gs/info b/lib/gs/info -deleted file mode 100644 -index 05982e7..0000000 ---- a/lib/gs/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: A Graphics System used to write platform independent user interfaces -diff --git a/lib/hipe/doc/src/Makefile b/lib/hipe/doc/src/Makefile -index d440178..9e0ae62 100644 ---- a/lib/hipe/doc/src/Makefile -+++ b/lib/hipe/doc/src/Makefile -@@ -53,7 +53,6 @@ GIF_FILES = - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -108,7 +107,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - - - release_spec: -diff --git a/lib/hipe/info b/lib/hipe/info -deleted file mode 100644 -index fe08fc8..0000000 ---- a/lib/hipe/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: misc Miscellaneous Applications --short: High Performance Erlang -\ No newline at end of file -diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile -index 8eda436..bcf99ec 100644 ---- a/lib/ic/doc/src/Makefile -+++ b/lib/ic/doc/src/Makefile -@@ -87,7 +87,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -282,7 +281,6 @@ ifdef DOCSUPPORT - release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/pdf - $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - (/bin/cp -rf $(HTMLDIR) $(RELSYSDIR)/doc) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 -@@ -304,7 +302,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - ifneq (,$(JAVA)) - $(INSTALL_DIR) $(RELSYSDIR)/doc/html/java - $(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/resources -diff --git a/lib/ic/info b/lib/ic/info -deleted file mode 100644 -index 96cb88d..0000000 ---- a/lib/ic/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: orb Object Request Broker & IDL Applications --short: IDL compiler -diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile -index e4cb0c4..4f6da7c 100644 ---- a/lib/inets/doc/src/Makefile -+++ b/lib/inets/doc/src/Makefile -@@ -90,7 +90,6 @@ HTML_FILES = \ - $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html) \ -@@ -212,7 +211,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -234,7 +232,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/inets/info b/lib/inets/info -deleted file mode 100644 -index 079a271..0000000 ---- a/lib/inets/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: A set of services such as a Web server and a ftp client etc. -diff --git a/lib/inviso/doc/src/Makefile b/lib/inviso/doc/src/Makefile -index 1b184ed..dc339c9 100644 ---- a/lib/inviso/doc/src/Makefile -+++ b/lib/inviso/doc/src/Makefile -@@ -59,8 +59,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -111,7 +109,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/inviso/info b/lib/inviso/info -deleted file mode 100644 -index 3190d6d..0000000 ---- a/lib/inviso/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A trace tool for both development and delivered systems. -diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile -index acd5307..c5a2f15 100644 ---- a/lib/jinterface/doc/src/Makefile -+++ b/lib/jinterface/doc/src/Makefile -@@ -93,7 +93,6 @@ JAVA_DOC_FILES = \ - stylesheet.css \ - help-doc.html - --INFO_FILE = ../../info - JAVA_EXTRA_FILES = $(JAVA_DOC_FILES:%=$(HTMLDIR)/java/%) - - JAVA_GEN_FILES = \ -@@ -164,7 +163,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH) -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - (/bin/cp -rf ../html $(RELSYSDIR)/doc) - - # $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ -diff --git a/lib/jinterface/info b/lib/jinterface/info -deleted file mode 100644 -index 66e8165..0000000 ---- a/lib/jinterface/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: Low level interface to Java -diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile -index f8c1cac..3238655 100644 ---- a/lib/kernel/doc/src/Makefile -+++ b/lib/kernel/doc/src/Makefile -@@ -84,8 +84,6 @@ XML_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN4_FILES = $(XML_REF4_FILES:%.xml=$(MAN4DIR)/%.4) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) -@@ -138,7 +136,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man4 -diff --git a/lib/kernel/info b/lib/kernel/info -deleted file mode 100644 -index c7c1a89..0000000 ---- a/lib/kernel/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: basic Basic Applications --short: Functionality necessary to run the Erlang System itself -diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile -index 4b3c117..39a942f 100644 ---- a/lib/megaco/doc/src/Makefile -+++ b/lib/megaco/doc/src/Makefile -@@ -60,8 +60,6 @@ HTML_PART_FILES = $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - - HTML_FILES = $(HTML_APP_FILES) $(HTML_EXTRA_FILES) $(HTML_PART_FILES) - --INFO_FILE = ../../info -- - HTML_REF3_FILES = $(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_CHAPTER_FILES = $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) - -@@ -244,7 +242,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELSYSDIR)/doc/standard -@@ -266,7 +263,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(IMG_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(TOP_HTML_FILES) $(RELSYSDIR)/doc -diff --git a/lib/megaco/info b/lib/megaco/info -deleted file mode 100644 -index e6d588f..0000000 ---- a/lib/megaco/info -+++ /dev/null -@@ -1,5 +0,0 @@ --group: comm --short: Megaco/H.248 is a protocol for control of elements in a physically --short: decomposed multimedia gateway, enabling separation of call control --short: from media conversion. -- -diff --git a/lib/mnesia/doc/src/Makefile b/lib/mnesia/doc/src/Makefile -index f45b513..ddcb326 100644 ---- a/lib/mnesia/doc/src/Makefile -+++ b/lib/mnesia/doc/src/Makefile -@@ -96,7 +96,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_HTML_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -207,7 +206,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -@@ -227,7 +225,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - endif -diff --git a/lib/mnesia/info b/lib/mnesia/info -deleted file mode 100644 -index bfd0816..0000000 ---- a/lib/mnesia/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: dat Database Applications --short: A heavy duty real-time distributed database -diff --git a/lib/observer/doc/src/Makefile b/lib/observer/doc/src/Makefile -index f82a49a..d99f0fb 100644 ---- a/lib/observer/doc/src/Makefile -+++ b/lib/observer/doc/src/Makefile -@@ -77,8 +77,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) - -@@ -136,7 +134,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/observer/info b/lib/observer/info -deleted file mode 100644 -index f419221..0000000 ---- a/lib/observer/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: Observer, tools for tracing and investigation of distributed systems -diff --git a/lib/odbc/doc/src/Makefile b/lib/odbc/doc/src/Makefile -index e2f0973..0e2b686 100644 ---- a/lib/odbc/doc/src/Makefile -+++ b/lib/odbc/doc/src/Makefile -@@ -81,7 +81,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_HTML_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) \ - --INFO_FILE = ../../info - EXTRA_FILES = $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ - $(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \ -@@ -190,7 +189,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -209,7 +207,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - endif -diff --git a/lib/odbc/info b/lib/odbc/info -deleted file mode 100644 -index 846dfc2..0000000 ---- a/lib/odbc/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: dat --short: An interface to relational SQL-databases built on ODBC (Open Database --short: Connectivity). -diff --git a/lib/orber/doc/src/Makefile b/lib/orber/doc/src/Makefile -index b8e26d5..29ebe1f 100644 ---- a/lib/orber/doc/src/Makefile -+++ b/lib/orber/doc/src/Makefile -@@ -120,7 +120,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = summary.html.src \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -233,7 +232,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -252,7 +250,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/orber/info b/lib/orber/info -deleted file mode 100644 -index c92ea38..0000000 ---- a/lib/orber/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: orb --short: A CORBA Object Request Broker -diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index c976574..8d75df9 100644 ---- a/lib/os_mon/doc/src/Makefile -+++ b/lib/os_mon/doc/src/Makefile -@@ -62,8 +62,6 @@ XML_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) -@@ -114,7 +112,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/os_mon/info b/lib/os_mon/info -deleted file mode 100644 -index bc3f971..0000000 ---- a/lib/os_mon/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: oam --short: A monitor which allows inspection of the underlying operating system -- -diff --git a/lib/otp_mibs/doc/src/Makefile b/lib/otp_mibs/doc/src/Makefile -index bd28100..05ea77f 100644 ---- a/lib/otp_mibs/doc/src/Makefile -+++ b/lib/otp_mibs/doc/src/Makefile -@@ -56,8 +56,6 @@ GIF_FILES = note.gif - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -107,7 +105,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/otp_mibs/info b/lib/otp_mibs/info -deleted file mode 100644 -index aedd1c8..0000000 ---- a/lib/otp_mibs/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: oam Operation & Maintenance Applications --short: SNMP management information base for Erlang/OTP nodes. -diff --git a/lib/parsetools/doc/src/Makefile b/lib/parsetools/doc/src/Makefile -index 6e693e0..8792cdc 100644 ---- a/lib/parsetools/doc/src/Makefile -+++ b/lib/parsetools/doc/src/Makefile -@@ -59,8 +59,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_HTML_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -110,7 +108,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/parsetools/info b/lib/parsetools/info -deleted file mode 100644 -index bcfb652..0000000 ---- a/lib/parsetools/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A set of parsing and lexical analysis tools -diff --git a/lib/percept/doc/src/Makefile b/lib/percept/doc/src/Makefile -index f0d43c5..56e32db 100644 ---- a/lib/percept/doc/src/Makefile -+++ b/lib/percept/doc/src/Makefile -@@ -105,8 +105,6 @@ GIF_FILES = \ - img_esi_result.gif - - # ---------------------------------------------------- --INFO_FILE = ../../info -- - HTML_FILES = \ - $(XML_REF_MAN:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) -@@ -181,7 +179,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(HTML_EXAMPLE_FILES) $(HTML_STYLESHEET_FILES) \ - $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/percept/info b/lib/percept/info -deleted file mode 100644 -index 07d58d2..0000000 ---- a/lib/percept/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A concurrency profiler tool. -diff --git a/lib/pman/doc/src/Makefile b/lib/pman/doc/src/Makefile -index 4e116cb..d67b3c1 100644 ---- a/lib/pman/doc/src/Makefile -+++ b/lib/pman/doc/src/Makefile -@@ -57,8 +57,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -108,7 +106,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/pman/info b/lib/pman/info -deleted file mode 100644 -index 22003ed..0000000 ---- a/lib/pman/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A graphical process manager used to inspect Erlang processes. -diff --git a/lib/public_key/doc/src/Makefile b/lib/public_key/doc/src/Makefile -index 298c28a..b5c36de 100644 ---- a/lib/public_key/doc/src/Makefile -+++ b/lib/public_key/doc/src/Makefile -@@ -68,8 +68,6 @@ TOP_HTML_FILES = - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - EXTRA_FILES = \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -180,7 +178,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -199,7 +196,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - endif -diff --git a/lib/public_key/info b/lib/public_key/info -deleted file mode 100644 -index 0fa0248..0000000 ---- a/lib/public_key/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: API to public key infrastructure. -diff --git a/lib/reltool/doc/src/Makefile b/lib/reltool/doc/src/Makefile -index 8bc1488..cc96e25 100644 ---- a/lib/reltool/doc/src/Makefile -+++ b/lib/reltool/doc/src/Makefile -@@ -46,8 +46,6 @@ XML_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -101,7 +99,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/reltool/info b/lib/reltool/info -deleted file mode 100644 -index 9aacf0f..0000000 ---- a/lib/reltool/info -+++ /dev/null -@@ -1,7 +0,0 @@ --group: tools --short: Reltool is a release management tool. It analyses a given --short: Erlang/OTP installation and determines various dependencies --short: between applications. The graphical frontend depicts the --short: dependencies and enables interactive customization of a --short: target system. The backend provides a batch interface --short: for generation of customized target systems. -diff --git a/lib/runtime_tools/doc/src/Makefile b/lib/runtime_tools/doc/src/Makefile -index dbbae81..bf4f9f7 100644 ---- a/lib/runtime_tools/doc/src/Makefile -+++ b/lib/runtime_tools/doc/src/Makefile -@@ -60,8 +60,6 @@ GIF_FILES = - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) - -@@ -113,7 +111,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/runtime_tools/info b/lib/runtime_tools/info -deleted file mode 100644 -index 87f0160..0000000 ---- a/lib/runtime_tools/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: Runtime tools, tools to include in a production system -diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile -index eb880cc..cb045b1 100644 ---- a/lib/sasl/doc/src/Makefile -+++ b/lib/sasl/doc/src/Makefile -@@ -67,8 +67,6 @@ XML_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN4_FILES = $(XML_REF4_FILES:%.xml=$(MAN4DIR)/%.4) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) -@@ -121,7 +119,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man4 -diff --git a/lib/sasl/info b/lib/sasl/info -deleted file mode 100644 -index 479392c..0000000 ---- a/lib/sasl/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: basic --short: The System Architecture Support Libraries is a set of tools for --short: release upgrades and alarm handling etc. -diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile -index e8d9efb..cf654a6 100644 ---- a/lib/snmp/doc/src/Makefile -+++ b/lib/snmp/doc/src/Makefile -@@ -65,8 +65,6 @@ XML_ERRS = $(XML_FILES:%.xml=%.latex.xmls_errs) \ - XML_OUTPUT = $(XML_FILES:%.xml=%.latex.xmls_output) \ - $(XML_FILES:%.xml=%.html.xmls_output) - --INFO_FILE = ../../info -- - HTML_REF3_FILES = $(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_REF6_FILES = $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html) - HTML_CHAP_FILES = $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) -@@ -243,7 +241,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -@@ -268,7 +265,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/snmp/info b/lib/snmp/info -deleted file mode 100644 -index 6bda2fe..0000000 ---- a/lib/snmp/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: oam Operation & Maintenance Applications --short: Simple Network Management Protocol (SNMP) support including a --short: MIB compiler and tools for creating SNMP agents -diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile -index c4d8d99..9c03dcc 100644 ---- a/lib/ssh/doc/src/Makefile -+++ b/lib/ssh/doc/src/Makefile -@@ -66,7 +66,6 @@ XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -176,7 +175,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - else -@@ -195,7 +193,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - endif -diff --git a/lib/ssh/info b/lib/ssh/info -deleted file mode 100644 -index 41a2a2c..0000000 ---- a/lib/ssh/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: Secure Shell application with sftp and ssh support -\ No newline at end of file -diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile -index 3119d37..b092eeb 100644 ---- a/lib/ssl/doc/src/Makefile -+++ b/lib/ssl/doc/src/Makefile -@@ -64,7 +64,6 @@ XML_FLAGS += -defs cite cite.defs -booksty otpA4 - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -122,7 +121,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/ssl/info b/lib/ssl/info -deleted file mode 100644 -index 8f610b8..0000000 ---- a/lib/ssl/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: ssl- Secure Socket Layer. -diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile -index b558697..19cf8e6 100644 ---- a/lib/stdlib/doc/src/Makefile -+++ b/lib/stdlib/doc/src/Makefile -@@ -116,8 +116,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(GIF_FILES:%.gif=$(HTMLDIR)/%.gif) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) - -@@ -168,7 +166,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/stdlib/info b/lib/stdlib/info -deleted file mode 100644 -index af2495a..0000000 ---- a/lib/stdlib/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: basic --short: The Erlang standard libraries -diff --git a/lib/syntax_tools/doc/Makefile b/lib/syntax_tools/doc/Makefile -index 6afd16f..53e0b7c 100644 ---- a/lib/syntax_tools/doc/Makefile -+++ b/lib/syntax_tools/doc/Makefile -@@ -35,7 +35,6 @@ APPNAME=syntax_tools - DOC_TITLE="Welcome to SyntaxTools" - - HTML_FILES = *.html --INFO_FILE = ../info - # ---------------------------------------------------- - # Target Specs - # ---------------------------------------------------- -@@ -74,7 +73,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTML_FILES) $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - - - release_spec: -diff --git a/lib/syntax_tools/doc/src/Makefile b/lib/syntax_tools/doc/src/Makefile -index 291b3e3..7e652f6 100644 ---- a/lib/syntax_tools/doc/src/Makefile -+++ b/lib/syntax_tools/doc/src/Makefile -@@ -65,8 +65,6 @@ XML_FILES=\ - $(XML_NOTES_FILES) - - # ---------------------------------------------------- --INFO_FILE = ../../info -- - HTML_FILES = \ - $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) -@@ -130,7 +128,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/syntax_tools/info b/lib/syntax_tools/info -deleted file mode 100644 -index 79283f5..0000000 ---- a/lib/syntax_tools/info -+++ /dev/null -@@ -1,3 +0,0 @@ --group: tools --short: A utility used to handle abstract Erlang syntax trees, --short: reading source files differently, pretty-printing syntax trees. -diff --git a/lib/test_server/doc/src/Makefile b/lib/test_server/doc/src/Makefile -index c7ba415..1b0a187 100644 ---- a/lib/test_server/doc/src/Makefile -+++ b/lib/test_server/doc/src/Makefile -@@ -72,8 +72,6 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - - HTML_INTERNAL = $(XML_REF3_INTERNAL:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - MAN3_INTERNAL = $(XML_REF3_INTERNAL:%.xml=$(MAN3DIR)/%.3) - MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) -@@ -124,7 +122,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 -diff --git a/lib/test_server/info b/lib/test_server/info -deleted file mode 100644 -index 7a9ed6c..0000000 ---- a/lib/test_server/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: test Test Applications --short: The OTP Test Server -diff --git a/lib/toolbar/doc/src/Makefile b/lib/toolbar/doc/src/Makefile -index 76147c1..fde1201 100644 ---- a/lib/toolbar/doc/src/Makefile -+++ b/lib/toolbar/doc/src/Makefile -@@ -56,8 +56,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -107,7 +105,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/toolbar/info b/lib/toolbar/info -deleted file mode 100644 -index 706cbdf..0000000 ---- a/lib/toolbar/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A tool bar simplifying access to the Erlang tools -diff --git a/lib/tools/doc/src/Makefile b/lib/tools/doc/src/Makefile -index 433f123..e65b186 100644 ---- a/lib/tools/doc/src/Makefile -+++ b/lib/tools/doc/src/Makefile -@@ -76,8 +76,6 @@ GIF_FILES = \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - - HTML_REF_MAN_FILE = $(HTMLDIR)/index.html -@@ -126,7 +124,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/tools/info b/lib/tools/info -deleted file mode 100644 -index a253c25..0000000 ---- a/lib/tools/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools Tool Applications --short: A set of programming tools including a coverage analyzer etc -diff --git a/lib/tv/doc/src/Makefile b/lib/tv/doc/src/Makefile -index f30e030..3a43fda 100644 ---- a/lib/tv/doc/src/Makefile -+++ b/lib/tv/doc/src/Makefile -@@ -80,7 +80,6 @@ GIF_FILES = tv_start.gif \ - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info - EXTRA_FILES = \ - $(DEFAULT_GIF_FILES) \ - $(DEFAULT_HTML_FILES) \ -@@ -189,7 +188,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -@@ -209,7 +207,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - endif -diff --git a/lib/tv/info b/lib/tv/info -deleted file mode 100644 -index 63e88b0..0000000 ---- a/lib/tv/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: An ETS and MNESIA graphical table visualizer -diff --git a/lib/webtool/doc/src/Makefile b/lib/webtool/doc/src/Makefile -index 7b86752..b0da3ad 100644 ---- a/lib/webtool/doc/src/Makefile -+++ b/lib/webtool/doc/src/Makefile -@@ -63,8 +63,6 @@ GIF_FILES = - HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - --INFO_FILE = ../../info -- - MAN1_FILES = $(XML_REF1_FILES:%.xml=$(MAN1DIR)/%.1) - MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) - -@@ -117,7 +115,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man1 - $(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1 - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 -diff --git a/lib/webtool/info b/lib/webtool/info -deleted file mode 100644 -index 4d8dc6f..0000000 ---- a/lib/webtool/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: tools --short: A tool that simplifying the use of web based Erlang tools -diff --git a/lib/wx/doc/src/Makefile b/lib/wx/doc/src/Makefile -index c8eb617..b211eb6 100644 ---- a/lib/wx/doc/src/Makefile -+++ b/lib/wx/doc/src/Makefile -@@ -83,8 +83,6 @@ XML_FILES = \ - $(XML_NOTES_FILES) $(XML_APPLICATION_FILES) - - # ---------------------------------------------------- --INFO_FILE = ../../info -- - HTML_FILES = \ - $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) -@@ -158,7 +156,6 @@ release_docs_spec: docs - $(INSTALL_DIR) $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 - -diff --git a/lib/wx/info b/lib/wx/info -deleted file mode 100644 -index 05982e7..0000000 ---- a/lib/wx/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: A Graphics System used to write platform independent user interfaces -diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile -index 100a2fe..0c2c40a 100644 ---- a/lib/xmerl/doc/src/Makefile -+++ b/lib/xmerl/doc/src/Makefile -@@ -90,8 +90,6 @@ XML_FILES= \ - $(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES) - - # ---------------------------------------------------- --INFO_FILE = ../../info -- - HTML_FILES = $(XML_REF_MAN:%.xml=$(HTMLDIR)/%.html) \ - $(XML_HTML_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) -@@ -167,7 +165,6 @@ release_docs_spec: docs - $(INSTALL_DATA) $(HTMLDIR)/* \ - $(RELSYSDIR)/doc/html - $(INSTALL_DATA) $(EXAMPLE_FILES) $(HTML_EXAMPLE_FILES) $(HTML_STYLESHEET_FILES) $(RELSYSDIR)/doc/html -- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) - $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 - $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3 - -diff --git a/lib/xmerl/info b/lib/xmerl/info -deleted file mode 100644 -index 81d16ab..0000000 ---- a/lib/xmerl/info -+++ /dev/null -@@ -1,2 +0,0 @@ --group: comm --short: Provides support for XML 1.0 diff --git a/otp-0006-Fix-install-dir-typo-for-snmp-man3.patch b/otp-0006-Fix-install-dir-typo-for-snmp-man3.patch new file mode 100644 index 0000000..f340036 --- /dev/null +++ b/otp-0006-Fix-install-dir-typo-for-snmp-man3.patch @@ -0,0 +1,22 @@ +From: Hans Ulrich Niedermann +Date: Mon, 21 Mar 2011 15:53:14 +0100 +Subject: [PATCH] Fix install dir typo for snmp man3 + +This is an obvious thing that should be fixed upstream. +--- + lib/snmp/doc/src/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile +index 35ed63e..30fabc1 100644 +--- a/lib/snmp/doc/src/Makefile ++++ b/lib/snmp/doc/src/Makefile +@@ -286,7 +286,7 @@ release_docs_spec: docs + $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR) + $(INSTALL_DIR) $(RELEASE_PATH)/man/man1 + $(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1 +- $(INSTALL_DIR) $(RELEASE_PATH)/man/man ++ $(INSTALL_DIR) $(RELEASE_PATH)/man/man3 + $(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3 + $(INSTALL_DIR) $(RELEASE_PATH)/man/man6 + $(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6 diff --git a/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 95bbaae..5d6eb18 100644 --- a/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 8d75df9..95f0101 100644 +index c976574..6267378 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile @@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) diff --git a/otp-0008-Do-not-install-.bat-files-on-non-win32-machines.patch b/otp-0008-Do-not-install-.bat-files-on-non-win32-machines.patch index 4851c62..c8587bf 100644 --- a/otp-0008-Do-not-install-.bat-files-on-non-win32-machines.patch +++ b/otp-0008-Do-not-install-.bat-files-on-non-win32-machines.patch @@ -1,37 +1,40 @@ -From: Peter Lemenkov -Date: Sat, 19 Jun 2010 10:25:29 +0400 +From: Hans Ulrich Niedermann +Date: Mon, 21 Mar 2011 14:27:45 +0100 Subject: [PATCH] Do not install *.bat files on non-win32 machines Signed-off-by: Peter Lemenkov +Signed-off-by: Hans Ulrich Niedermann --- - lib/observer/src/Makefile | 8 ++++++-- + lib/observer/src/Makefile | 9 ++++++--- lib/webtool/priv/Makefile | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index b4eb518..353daef 100644 +index 2d06cb6..3875b62 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -56,11 +56,15 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET) +@@ -56,13 +56,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET) PRIVDIR= ../priv WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool BINDIR= $(PRIVDIR)/bin +ifeq ($(findstring win32,$(TARGET)),win32) -+WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat ++WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat $(BINDIR)/cdv.bat +else +WIN32_EXECUTABLES= +endif EXECUTABLES= \ $(BINDIR)/etop \ $(BINDIR)/getop \ + $(BINDIR)/cdv \ - $(BINDIR)/etop.bat \ -- $(BINDIR)/getop.bat +- $(BINDIR)/getop.bat \ +- $(BINDIR)/cdv.bat + $(WIN32_EXECUTABLES) CDVDIR= $(PRIVDIR)/crashdump_viewer GIF_FILES= \ $(CDVDIR)/collapsd.gif \ diff --git a/lib/webtool/priv/Makefile b/lib/webtool/priv/Makefile -index 56ab772..c29e912 100644 +index 56ab772..6e1c660 100644 --- a/lib/webtool/priv/Makefile +++ b/lib/webtool/priv/Makefile @@ -39,8 +39,12 @@ HTDOCS_FILES = root/doc/index.html \ @@ -41,7 +44,7 @@ index 56ab772..c29e912 100644 -SCRIPTS = bin/start_webtool \ - bin/start_webtool.bat +ifeq ($(findstring win32,$(TARGET)),win32) -+WIN32_SCRIPTS= bin/start.bat ++WIN32_SCRIPTS= bin/start_webtool.bat +else +WIN32_SCRIPTS= +endif diff --git a/otp-0009-Do-not-install-VxWorks-specific-docs.patch b/otp-0009-Do-not-install-VxWorks-specific-docs.patch index cb84574..8656ef1 100644 --- a/otp-0009-Do-not-install-VxWorks-specific-docs.patch +++ b/otp-0009-Do-not-install-VxWorks-specific-docs.patch @@ -8,7 +8,7 @@ Signed-off-by: Peter Lemenkov 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile -index be99288..4bb07c4 100644 +index 6578923..44206fd 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -46,7 +46,6 @@ XML_REF1_FILES = epmd.xml \ diff --git a/otp-0010-Do-not-install-erlang-sources.patch b/otp-0010-Do-not-install-erlang-sources.patch index 525de6f..3769d0a 100644 --- a/otp-0010-Do-not-install-erlang-sources.patch +++ b/otp-0010-Do-not-install-erlang-sources.patch @@ -1,8 +1,9 @@ -From: Peter Lemenkov -Date: Sat, 19 Jun 2010 13:21:10 +0400 +From: Hans Ulrich Niedermann +Date: Mon, 21 Mar 2011 15:41:49 +0100 Subject: [PATCH] Do not install erlang sources Signed-off-by: Peter Lemenkov +Signed-off-by: Hans Ulrich Niedermann --- erts/preloaded/src/Makefile | 2 -- lib/appmon/src/Makefile | 2 +- @@ -74,11 +75,11 @@ Signed-off-by: Peter Lemenkov lib/toolbar/src/Makefile | 2 +- lib/tools/src/Makefile | 2 +- lib/tv/src/Makefile | 2 +- - lib/typer/src/Makefile | 2 +- + lib/typer/src/Makefile | 2 -- lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 74 files changed, 58 insertions(+), 99 deletions(-) + 74 files changed, 57 insertions(+), 100 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 1456388..81db627 100644 @@ -120,10 +121,10 @@ index 2733cde..42a674e 100644 $(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 027667e..ff6a319 100644 +index 84b122b..5c01656 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -133,10 +134,10 @@ index 027667e..ff6a319 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/include diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 0f6d2f6..9ee17e5 100644 +index 1238d11..93747f6 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -160,8 +160,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -162,8 +162,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -148,10 +149,10 @@ index 0f6d2f6..9ee17e5 100644 $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index ba6e2b1..50a73d9 100644 +index a62d47c..66ce6d9 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile -@@ -199,7 +199,7 @@ release_spec: opt +@@ -200,7 +200,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -161,10 +162,10 @@ index ba6e2b1..50a73d9 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index 884c8f1..9c36cc1 100644 +index 56a67cd..19933c9 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile -@@ -165,7 +165,7 @@ release_spec: opt +@@ -166,7 +166,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -295,10 +296,10 @@ index e8a07a5..d0ac3a9 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index ca95c4c..56a7745 100644 +index 9c5a9d3..5de4e3d 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile -@@ -87,7 +87,7 @@ release_spec: opt +@@ -88,7 +88,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -499,10 +500,10 @@ index aaf3cfb..0236a49 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index bdd8c5e..64d971f 100644 +index 55cc68d..78e46ae 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -126,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/http_server @@ -512,18 +513,18 @@ index bdd8c5e..64d971f 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 4632ff3..6014db2 100644 +index 20e2291..a4e4763 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/inets_app -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/inets_app -+ $(INSTALL_DATA) $(HRL_FILES) $(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 - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile index 759b70c..9e4f769 100644 --- a/lib/inets/src/tftp/Makefile @@ -666,10 +667,10 @@ index e032f56..e357187 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 353daef..c61d157 100644 +index 3875b62..cebfbab 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -113,7 +113,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -114,7 +114,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -783,7 +784,7 @@ index e573e57..bdbced1 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 51f4053..6179e0a 100644 +index b042b0c..947009c 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -46,8 +46,6 @@ MODULES = \ @@ -869,18 +870,18 @@ index d89eb4e..2adf916 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ $(RELSYSDIR)/ebin diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index 4be60e1..df7ed2d 100644 +index 0ceaf27..872611d 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -115,7 +115,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/compiler -- $(INSTALL_DATA) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(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) $(TARGET_FILES) $(RELSYSDIR)/ebin - + $(INSTALL_DIR) $(RELSYSDIR)/bin diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile index c1d5703..568530d 100644 --- a/lib/snmp/src/manager/Makefile @@ -959,10 +960,10 @@ index 50369e6..12c6db4 100644 release_docs_spec: diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index 3dca551..217129b 100644 +index 63a585d..4855056 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile -@@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -126,7 +126,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -1010,18 +1011,18 @@ index 457b9d3..1d2c97c 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 9c9ef61..db92881 100644 +index 620b3eb..67c266f 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile -@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -102,8 +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) \ -+ $(INSTALL_DATA) $(HRL_FILES) \ - $(RELSYSDIR)/src +- $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin + diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile index 62845cd..841cf11 100644 --- a/lib/webtool/src/Makefile diff --git a/otp-0012-Remove-rpath-from-esock_ssl.patch b/otp-0012-Remove-rpath-from-esock_ssl.patch new file mode 100644 index 0000000..f5bb4d0 --- /dev/null +++ b/otp-0012-Remove-rpath-from-esock_ssl.patch @@ -0,0 +1,23 @@ +From: Hans Ulrich Niedermann +Date: Mon, 31 Jan 2011 13:33:28 +0100 +Subject: [PATCH] Remove rpath from esock_ssl + +Unset SSL_CC_RUNTIME_LIBRARY_PATH to build esock_ssl +without rpathes. +--- + lib/ssl/c_src/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index bf4843b..90fb679 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -128,7 +128,7 @@ else + CC_R_OPT = + endif + +-SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ ++SSL_CC_RUNTIME_LIBRARY_PATH= + # Sigh... + ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@) + SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT) diff --git a/otp-0012-Remove-strange-name-field-in-efile_drv.c-as-it-upset.patch b/otp-0012-Remove-strange-name-field-in-efile_drv.c-as-it-upset.patch deleted file mode 100644 index cf9ce5a..0000000 --- a/otp-0012-Remove-strange-name-field-in-efile_drv.c-as-it-upset.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Patrik Nyblom -Date: Wed, 12 Jan 2011 15:41:46 +0100 -Subject: [PATCH] Remove strange name field in efile_drv.c as it upsets -D_FORTIFY_SOURCE - ---- - erts/emulator/drivers/common/efile_drv.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c -index 786fa7d..6449c6f 100644 ---- a/erts/emulator/drivers/common/efile_drv.c -+++ b/erts/emulator/drivers/common/efile_drv.c -@@ -385,7 +385,6 @@ struct t_data - ErlDrvBinary *binp; - int size; - int offset; -- char name[1]; - } read_file; - struct { - struct t_readdir_buf *first_buf; -@@ -1117,7 +1116,7 @@ static void invoke_read_file(void *data) - Sint64 size; - - if (! (d->result_ok = -- efile_openfile(&d->errInfo, d->c.read_file.name, -+ efile_openfile(&d->errInfo, d->b, - EFILE_MODE_READ, &fd, &size))) { - goto done; - } -@@ -3071,7 +3070,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) { - d->command = command; - d->reply = !0; - /* Copy name */ -- FILENAME_COPY(d->c.read_file.name, filename); -+ FILENAME_COPY(d->b, filename); - d->c.read_file.binp = NULL; - d->invoke = invoke_read_file; - d->free = free_read_file; diff --git a/otp-0013-Remove-rpath-from-esock_ssl.patch b/otp-0013-Remove-rpath-from-esock_ssl.patch deleted file mode 100644 index f5bb4d0..0000000 --- a/otp-0013-Remove-rpath-from-esock_ssl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Hans Ulrich Niedermann -Date: Mon, 31 Jan 2011 13:33:28 +0100 -Subject: [PATCH] Remove rpath from esock_ssl - -Unset SSL_CC_RUNTIME_LIBRARY_PATH to build esock_ssl -without rpathes. ---- - lib/ssl/c_src/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index bf4843b..90fb679 100644 ---- a/lib/ssl/c_src/Makefile.in -+++ b/lib/ssl/c_src/Makefile.in -@@ -128,7 +128,7 @@ else - CC_R_OPT = - endif - --SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ -+SSL_CC_RUNTIME_LIBRARY_PATH= - # Sigh... - ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@) - SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT) diff --git a/otp-get-patches.sh b/otp-get-patches.sh index b72d43f..5033e60 100755 --- a/otp-get-patches.sh +++ b/otp-get-patches.sh @@ -1,6 +1,6 @@ #!/bin/bash # Usage: -# ./otp-get-patches.sh /path/to/otp OTP_R14B01 fedora-R14B01 +# ./otp-get-patches.sh /path/to/otp OTP_R14B02 fedora-R14B02 # # otp-get-patches.sh - update erlang.spec and otp-00*.patch files #