summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Lemenkov <peter@fedoraproject.org>2010-06-23 07:42:20 +0000
committerPeter Lemenkov <peter@fedoraproject.org>2010-06-23 07:42:20 +0000
commit96952bd1ed3128c2b0cafc28e28432c5f17d3f85 (patch)
tree50882b91c77d1acf75132db898e6e2d04d7dbf77
parentaaa400a108ff5cd07b3dbe031ee13b4fcd568405 (diff)
downloaderlang-96952bd1ed3128c2b0cafc28e28432c5f17d3f85.tar.gz
erlang-96952bd1ed3128c2b0cafc28e28432c5f17d3f85.tar.xz
erlang-96952bd1ed3128c2b0cafc28e28432c5f17d3f85.zip
Ver. R14A
-rw-r--r--.cvsignore2
-rw-r--r--erlang.spec126
-rw-r--r--import.log1
-rw-r--r--otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch49
-rw-r--r--otp-0001-Do-not-format-man-pages.patch32
-rw-r--r--otp-0002-Remove-rpath.patch16
-rw-r--r--otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch (renamed from otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch)6
-rw-r--r--otp-0004-Fix-shared-libraries-installation.patch58
-rw-r--r--otp-0005-Do-not-install-C-sources.patch172
-rw-r--r--otp-0006-Do-not-install-Java-sources.patch40
-rw-r--r--otp-0006-Fix-check-for-compile-workspace-overflow.patch55
-rw-r--r--otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch1959
-rw-r--r--otp-0007-Install-missing-emacs-files.patch28
-rw-r--r--otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch68
-rw-r--r--otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch55
-rw-r--r--otp-0010-Do-not-install-VxWorks-specific-docs.patch25
-rw-r--r--otp-0011-Do-not-install-erlang-sources.patch1072
-rw-r--r--otp-links.patch13
-rw-r--r--sources2
19 files changed, 3507 insertions, 272 deletions
diff --git a/.cvsignore b/.cvsignore
index ae1a587..2c074ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-otp_src_R13B04.tar.gz
+otp_src_R14A.tar.gz
diff --git a/erlang.spec b/erlang.spec
index a29647a..27fef47 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,34 +1,40 @@
-%define ver R13B
-%define rel 04
+%define ver R14A
+%define rel 0
Name: erlang
Version: %{ver}
-Release: %{rel}.12%{?dist}
+Release: %{rel}.1%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
License: ERPL
URL: http://www.erlang.org
-Source0: http://www.erlang.org/download/otp_src_%{ver}%{rel}.tar.gz
+Source0: http://www.erlang.org/download/otp_src_%{ver}.tar.gz
Source3: erlang-find-provides.escript
Source4: erlang-find-provides.sh
Source5: erlang-find-requires.escript
Source6: erlang-find-requires.sh
Source7: macros.erlang
-# TODO this patch needs rebase against current tree
-Patch0: otp-links.patch
# Fedora-specific
-Patch1: otp-0001-Do-not-format-man-pages.patch
+Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
# Fedora-specific
Patch2: otp-0002-Remove-rpath.patch
-# Upstreamed
-Patch4: otp-0004-Fix-shared-libraries-installation.patch
# Fedora-specific
-Patch5: otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch
-# Upstreamed
-Patch6: otp-0006-Fix-check-for-compile-workspace-overflow.patch
-# Install accidentally forgotten emacs files (see rhbz #585349) (already fixed upstream)
-Patch7: otp-0007-Install-missing-emacs-files.patch
+Patch4: otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
+# Fedora-specific
+Patch5: otp-0005-Do-not-install-C-sources.patch
+# Fedora-specific
+Patch6: otp-0006-Do-not-install-Java-sources.patch
+# Fedora-specific
+Patch7: otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
+# Fedora-specific
+Patch8: otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+# Fedora-specific
+Patch9: otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
+# Fedora-specific
+Patch10: otp-0010-Do-not-install-VxWorks-specific-docs.patch
+# Fedora-specific
+Patch11: otp-0011-Do-not-install-erlang-sources.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -855,16 +861,30 @@ Obsoletes: %{name} < R13B-04.5
Provides support for XML 1.0.
%prep
-%setup -q -n otp_src_%{ver}%{rel}
+%setup -q -n otp_src_%{ver}
%patch1 -p1 -b .do_not_format_manpages
%patch2 -p1 -b .rpath
-%patch4 -p1 -b .fix_shared_lib_install
-%patch5 -p1 -b .dlopen_opengl_libs
-%patch6 -p1 -b .pcre_overflow
-%patch7 -p1 -b .missing_emacs_files
+%patch4 -p1 -b .dlopen_opengl_libs
+%patch5 -p1 -b .no_c_sources
+%patch6 -p1 -b .no_java_sources
+%patch7 -p1 -b .no_info_files
+%patch8 -p1 -b .no_win32_nteventlog
+%patch9 -p1 -b .no_win32_bat_files
+%patch10 -p1 -b .no_vxworks_specific
+%patch11 -p1 -b .no_erlang_sources
# remove shipped zlib sources
rm -f erts/emulator/zlib/*.[ch]
+# Fix 664 file mode
+chmod 644 lib/kernel/examples/uds_dist/c_src/Makefile
+chmod 644 lib/kernel/examples/uds_dist/src/Makefile
+chmod 644 lib/ssl/examples/certs/Makefile
+chmod 644 lib/ssl/examples/src/Makefile
+
+# Remove old txt files
+rm -f lib/ssl/examples/certs/etc/otpCA/index.txt.old
+rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old
+
%build
%ifarch sparcv9 sparc64
@@ -882,13 +902,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-docs
# fix 0775 permission on some directories
-find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755
-
-# Fix 664 file mode
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/Makefile
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Makefile
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile
+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
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin
# Relocate doc-files into the proper directory
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib
@@ -904,57 +920,14 @@ mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{n
mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
-# Win32-specific functionality
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/getop.bat
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/nteventlog.beam
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat
+# Win32-specific man-pages
rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.*
rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.*
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.*
rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.*
-# Do not mention nteventlog in os_mon.app, see rhbz #592251
-sed -i "s,\,\s*nteventlog,," $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/os_mon.app
-
-# VxWorks specific
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.*
-
-# Remove old txt files
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/erlangCA/index.txt.old
-
-# remove unneeded Erlang sources, but keep *.hrl files
-for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name "*.hrl" -print -delete || true ; done
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/{cerl,flow,icode,main,misc,util}/*.erl
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/orber-*/COSS/CosNaming/*.erl
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosFileTransfer-*/src
-
-# remove C and Java sources
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/erl_interface-*/src
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/c_src
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/java_src
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/java_src
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/c_src
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src
# remove empty directory
rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man
-# remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/info
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info
-rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/vsn.mk
-
-# No longer needed utilities for formatting man-pages
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/misc
-
-# Remove *.o files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/crypto-*/priv/obj
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj
-
# Install RPM related files
install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.escript
install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.sh
@@ -1002,6 +975,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/erlang/man/man3/ct_ftp.*
%{_libdir}/erlang/man/man3/ct_master.*
%{_libdir}/erlang/man/man3/ct_rpc.*
+%{_libdir}/erlang/man/man3/ct_slave.*
%{_libdir}/erlang/man/man3/ct_snmp.*
%{_libdir}/erlang/man/man3/ct_ssh.*
%{_libdir}/erlang/man/man3/ct_telnet.*
@@ -1194,12 +1168,14 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/erlc
%{_bindir}/escript
%{_bindir}/run_erl
+%{_bindir}/run_test
%{_bindir}/to_erl
%{_libdir}/erlang/bin/epmd
%{_libdir}/erlang/bin/erl
%{_libdir}/erlang/bin/erlc
%{_libdir}/erlang/bin/escript
%{_libdir}/erlang/bin/run_erl
+%{_libdir}/erlang/bin/run_test
%{_libdir}/erlang/bin/start
%{_libdir}/erlang/bin/start.boot
%{_libdir}/erlang/bin/start.script
@@ -1221,6 +1197,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/erlang/erts-*/bin/heart
%{_libdir}/erlang/erts-*/bin/inet_gethost
%{_libdir}/erlang/erts-*/bin/run_erl
+%{_libdir}/erlang/erts-*/bin/run_test
%{_libdir}/erlang/erts-*/bin/start
%{_libdir}/erlang/erts-*/bin/start.src
%{_libdir}/erlang/erts-*/bin/start_erl.src
@@ -1238,6 +1215,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/erlang/man/man1/start_erl.*
%{_libdir}/erlang/man/man3/driver_entry.*
%{_libdir}/erlang/man/man3/erl_driver.*
+%{_libdir}/erlang/man/man3/erl_nif.*
%{_libdir}/erlang/man/man3/erl_prim_loader.*
%{_libdir}/erlang/man/man3/erlang.*
%{_libdir}/erlang/man/man3/erts_alloc.*
@@ -1595,11 +1573,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%dir %{_libdir}/erlang/lib/ssl-*/
%{_libdir}/erlang/lib/ssl-*/ebin
-%{_libdir}/erlang/lib/ssl-*/include
-%{_libdir}/erlang/lib/ssl-*/pkix
%{_libdir}/erlang/lib/ssl-*/priv
%{_libdir}/erlang/lib/ssl-*/src
-%{_libdir}/erlang/man/man3/new_ssl.*
+%{_libdir}/erlang/man/man3/old_ssl.*
%{_libdir}/erlang/man/man3/ssl.*
%{_libdir}/erlang/man/man6/ssl.*
@@ -1612,6 +1588,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/erlang/man/man3/array.*
%{_libdir}/erlang/man/man3/base64.*
%{_libdir}/erlang/man/man3/beam_lib.*
+%{_libdir}/erlang/man/man3/binary.*
%{_libdir}/erlang/man/man3/c.*
%{_libdir}/erlang/man/man3/calendar.*
%{_libdir}/erlang/man/man3/dets.*
@@ -1968,6 +1945,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 18 2010 Peter Lemenkov <lemenkov@gmail.com> - R14A-0.1
+- R14A release
+
* Sat May 15 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.12
- Moved dialyzer and typer executables from erts to appropriate rpms
diff --git a/import.log b/import.log
index ba2c5fb..c7c14a1 100644
--- a/import.log
+++ b/import.log
@@ -9,3 +9,4 @@ erlang-R13B-04_8_fc12:HEAD:erlang-R13B-04.8.fc12.src.rpm:1272437605
erlang-R13B-04_9_fc12:HEAD:erlang-R13B-04.9.fc12.src.rpm:1272454729
erlang-R13B-04_11_fc12:HEAD:erlang-R13B-04.11.fc12.src.rpm:1273841579
erlang-R13B-04_12_fc12:HEAD:erlang-R13B-04.12.fc12.src.rpm:1273901095
+erlang-R14A-0_1_fc12:HEAD:erlang-R14A-0.1.fc12.src.rpm:1277278730
diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
new file mode 100644
index 0000000..36c5aa7
--- /dev/null
+++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
@@ -0,0 +1,49 @@
+From c237cca27ecf572c1b4505f2ec979b0c294f37d8 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 25 Feb 2010 16:45:28 +0300
+Subject: [PATCH 01/11] Do not format man-pages and do not install miscellaneous
+ utilities for dealing with man-pages.
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ erts/etc/common/Makefile.in | 4 ----
+ erts/etc/unix/Install.src | 10 ----------
+ 2 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
+index 6551b29..de2ca79 100644
+--- a/erts/etc/common/Makefile.in
++++ b/erts/etc/common/Makefile.in
+@@ -537,10 +537,6 @@ endif
+ ifneq ($(INSTALL_TOP_BIN),)
+ $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) $(RELEASE_PATH)
+ endif
+-ifneq ($(INSTALL_MISC),)
+- $(INSTALL_DIR) $(RELEASE_PATH)/misc
+- $(INSTALL_SCRIPT) $(INSTALL_MISC) $(RELEASE_PATH)/misc
+-endif
+ ifneq ($(INSTALL_ERL_OSE),)
+ $(INSTALL_DIR) $(RELEASE_PATH)/build_erl_ose
+ cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
+diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
+index 7dead62..e522365 100644
+--- a/erts/etc/unix/Install.src
++++ b/erts/etc/unix/Install.src
+@@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
+ cp -p $Name.boot start.boot
+ cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
+
+-#
+-# Fixing the man pages
+-#
+-
+-if [ -d $ERL_ROOT/man ]
+-then
+- cd $ERL_ROOT
+- ./misc/format_man_pages $ERL_ROOT
+-fi
+-
+ exit 0
+--
+1.7.0.1
+
diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch
deleted file mode 100644
index 632408b..0000000
--- a/otp-0001-Do-not-format-man-pages.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Thu, 25 Feb 2010 16:45:28 +0300
-Subject: [PATCH 1/7] Do not format man-pages
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
----
- erts/etc/unix/Install.src | 10 ----------
- 1 files changed, 0 insertions(+), 10 deletions(-)
-
-diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
-index 83f9690..d26137d 100644
---- a/erts/etc/unix/Install.src
-+++ b/erts/etc/unix/Install.src
-@@ -139,14 +139,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
- cp -p $Name.boot start.boot
- cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
-
--#
--# Fixing the man pages
--#
--
--if [ -d $ERL_ROOT/man ]
--then
-- cd $ERL_ROOT
-- ./misc/format_man_pages $ERL_ROOT
--fi
--
- exit 0
---
-1.6.6.1
-
diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch
index 1da9a67..b3fb15f 100644
--- a/otp-0002-Remove-rpath.patch
+++ b/otp-0002-Remove-rpath.patch
@@ -1,7 +1,7 @@
-From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001
+From b4f00d41b29982a0fb2362b9d63caf78b4c6f83a Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Feb 2010 16:57:43 +0300
-Subject: [PATCH 2/7] Remove rpath
+Subject: [PATCH 02/11] Remove rpath
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 18040a3..b169930 100644
+index e728db1..b797ed7 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -83,7 +83,7 @@ endif
@@ -24,18 +24,18 @@ index 18040a3..b169930 100644
else
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
-index b8acdac..2c2989a 100644
+index 0989f14..0d29444 100644
--- a/lib/crypto/priv/Makefile
+++ b/lib/crypto/priv/Makefile
-@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
+@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
- $(SO_DRIVER): $(OBJS)
+ $(SO_NIFLIB): $(OBJS)
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
-o $@ $^ -lcrypto
- $(DLL_DRIVER): $(OBJS)
+ $(DLL_NIFLIB): $(OBJS)
diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
index 49a209f..5e6c74e 100644
--- a/lib/ssl/c_src/Makefile.in
@@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644
SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
--
-1.6.6.1
+1.7.0.1
diff --git a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
index 4f55214..c4eed13 100644
--- a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch
+++ b/otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
@@ -1,7 +1,7 @@
-From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001
+From 062aaa0c3f0926a8b57173686985bd3aa74e2435 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 16 Apr 2010 21:13:47 +0400
-Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU
+Subject: [PATCH 04/11] Fix for dlopening libGL and libGLU
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@@ -31,5 +31,5 @@ index 63dd68f..36bf15f 100644
#endif
// fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
--
-1.6.6.1
+1.7.0.1
diff --git a/otp-0004-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch
deleted file mode 100644
index f828169..0000000
--- a/otp-0004-Fix-shared-libraries-installation.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Thu, 15 Apr 2010 13:31:36 +0400
-Subject: [PATCH 4/7] Fix shared libraries installation
-
-Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so,
-megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files
-previously.
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
----
- lib/asn1/c_src/Makefile | 2 +-
- lib/megaco/src/flex/Makefile.in | 2 +-
- lib/wx/c_src/Makefile.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 906c513..9e9cb18 100644
---- a/lib/asn1/c_src/Makefile
-+++ b/lib/asn1/c_src/Makefile
-@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
-
- release_spec: opt
- $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
-+ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
- $(INSTALL_DIR) $(RELSYSDIR)/c_src
- $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src
-
-diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 6ce9b34..5af651d 100644
---- a/lib/megaco/src/flex/Makefile.in
-+++ b/lib/megaco/src/flex/Makefile.in
-@@ -280,7 +280,7 @@ release_spec: opt
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex
-- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib
-+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib
- endif
-
-
-diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
-index 5a0b4ce..8710641 100644
---- a/lib/wx/c_src/Makefile.in
-+++ b/lib/wx/c_src/Makefile.in
-@@ -167,7 +167,7 @@ release_spec: opt
- $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE)
- $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/
- $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/
-- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE)
-+ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE)
-
- release_docs_spec:
-
---
-1.6.6.1
-
diff --git a/otp-0005-Do-not-install-C-sources.patch b/otp-0005-Do-not-install-C-sources.patch
new file mode 100644
index 0000000..8e71d09
--- /dev/null
+++ b/otp-0005-Do-not-install-C-sources.patch
@@ -0,0 +1,172 @@
+From 61a98426e5fdb296b349675a7e0851f515d7df73 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Fri, 18 Jun 2010 23:41:33 +0400
+Subject: [PATCH 05/11] Do not install C sources
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ lib/asn1/c_src/Makefile | 2 --
+ lib/crypto/c_src/Makefile.in | 3 ---
+ lib/erl_interface/src/Makefile.in | 18 ------------------
+ lib/ic/c_src/Makefile.in | 2 --
+ lib/megaco/src/flex/Makefile.in | 2 +-
+ lib/odbc/c_src/Makefile.in | 3 ---
+ lib/os_mon/c_src/Makefile.in | 1 -
+ lib/ssl/c_src/Makefile.in | 9 ---------
+ lib/tools/c_src/Makefile.in | 2 --
+ 9 files changed, 1 insertions(+), 41 deletions(-)
+
+diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
+index 9e9cb18..1d73d3c 100644
+--- a/lib/asn1/c_src/Makefile
++++ b/lib/asn1/c_src/Makefile
+@@ -125,8 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
+ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
+- $(INSTALL_DIR) $(RELSYSDIR)/c_src
+- $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src
+
+ release_docs_spec:
+
+diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
+index b797ed7..35ff433 100644
+--- a/lib/crypto/c_src/Makefile.in
++++ b/lib/crypto/c_src/Makefile.in
+@@ -126,10 +126,7 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
+- $(INSTALL_DATA) $(NIF_MAKEFILE) $(RELSYSDIR)/priv/obj
+- $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
+ $(INSTALL_PROGRAM) $(NIF_LIB) $(RELSYSDIR)/priv/lib
+
+ release_docs_spec:
+diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
+index 8ff142a..d785902 100644
+--- a/lib/erl_interface/src/Makefile.in
++++ b/lib/erl_interface/src/Makefile.in
+@@ -876,29 +876,11 @@ release: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/lib
+ $(INSTALL_DIR) $(RELSYSDIR)/bin
+- $(INSTALL_DIR) $(RELSYSDIR)/src/auxdir
+- $(INSTALL_DIR) $(RELSYSDIR)/src/connect
+- $(INSTALL_DIR) $(RELSYSDIR)/src/decode
+- $(INSTALL_DIR) $(RELSYSDIR)/src/encode
+- $(INSTALL_DIR) $(RELSYSDIR)/src/epmd
+- $(INSTALL_DIR) $(RELSYSDIR)/src/legacy
+- $(INSTALL_DIR) $(RELSYSDIR)/src/misc
+- $(INSTALL_DIR) $(RELSYSDIR)/src/prog
+- $(INSTALL_DIR) $(RELSYSDIR)/src/registry
+ $(INSTALL_DATA) $(HEADERS) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib
+ ifneq ($(EXE_TARGETS),)
+ $(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin
+ endif
+- $(INSTALL_DATA) $(EXTRA) $(RELSYSDIR)/src
+- $(INSTALL_DATA) connect/*.[ch] $(RELSYSDIR)/src/connect
+- $(INSTALL_DATA) decode/*.[ch] $(RELSYSDIR)/src/decode
+- $(INSTALL_DATA) encode/*.[ch] $(RELSYSDIR)/src/encode
+- $(INSTALL_DATA) epmd/*.[ch] $(RELSYSDIR)/src/epmd
+- $(INSTALL_DATA) misc/*.[ch] $(RELSYSDIR)/src/misc
+- $(INSTALL_DATA) registry/*.[ch] $(RELSYSDIR)/src/registry
+- $(INSTALL_DATA) legacy/*.[ch] $(RELSYSDIR)/src/legacy
+- $(INSTALL_DATA) prog/*.[ch] $(RELSYSDIR)/src/prog
+
+ release_docs:
+
+diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
+index 6eef782..091895b 100644
+--- a/lib/ic/c_src/Makefile.in
++++ b/lib/ic/c_src/Makefile.in
+@@ -144,10 +144,8 @@ $(OBJDIR)/%.o: %.c
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/c_src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
+- $(INSTALL_DATA) ic.c ic_tmo.c $(RELSYSDIR)/c_src
+ $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib
+
+diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
+index 5af651d..2ccf2a9 100644
+--- a/lib/megaco/src/flex/Makefile.in
++++ b/lib/megaco/src/flex/Makefile.in
+@@ -279,7 +279,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
+- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex
++ $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex
+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib
+ endif
+
+diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
+index ed3eeb1..c01d9bf 100644
+--- a/lib/odbc/c_src/Makefile.in
++++ b/lib/odbc/c_src/Makefile.in
+@@ -131,11 +131,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ ifdef EXE_TARGET
+- $(INSTALL_DIR) $(RELSYSDIR)/c_src
+- $(INSTALL_DATA) $(C_FILES) $(H_FILES) $(RELSYSDIR)/c_src
+ $(INSTALL_DIR) $(RELSYSDIR)/priv
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/bin
+- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj
+ $(INSTALL_PROGRAM) $(EXE_TARGET) $(RELSYSDIR)/priv/bin
+ endif
+
+diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
+index 1a371eb..62eac66 100644
+--- a/lib/os_mon/c_src/Makefile.in
++++ b/lib/os_mon/c_src/Makefile.in
+@@ -136,7 +136,6 @@ release_spec:
+ else
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/bin
+ $(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin
+ endif
+diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
+index 5e6c74e..bf4843b 100644
+--- a/lib/ssl/c_src/Makefile.in
++++ b/lib/ssl/c_src/Makefile.in
+@@ -199,15 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/bin
+ $(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin
+-ifneq ($(SSL_MAKEFILE),)
+- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj
+- $(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj
+- sed -e "s;%BINDIR%;../bin;" \
+- -e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \
+- -e "s;%OBJS;$(OBJS);" \
+- -e "s;%LIBS%;$(LIBS);" ./Makefile.dist \
+- > $(RELSYSDIR)/priv/obj/Makefile
+-endif
+
+ release_docs_spec:
+
+diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
+index e6b76e2..86da1b7 100644
+--- a/lib/tools/c_src/Makefile.in
++++ b/lib/tools/c_src/Makefile.in
+@@ -189,8 +189,6 @@ include ../vsn.mk
+ RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
+
+ release_spec: all
+- $(INSTALL_DIR) $(RELSYSDIR)/c_src
+- $(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) $(RELSYSDIR)/c_src
+ ifneq ($(PROGS),)
+ $(INSTALL_DIR) $(RELSYSDIR)/bin
+ $(INSTALL_PROGRAM) $(PROGS) $(RELSYSDIR)/bin
+--
+1.7.0.1
+
diff --git a/otp-0006-Do-not-install-Java-sources.patch b/otp-0006-Do-not-install-Java-sources.patch
new file mode 100644
index 0000000..7994118
--- /dev/null
+++ b/otp-0006-Do-not-install-Java-sources.patch
@@ -0,0 +1,40 @@
+From 1e7fb0a24915e4b0de46e613fb4e308af56a22e7 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 19 Jun 2010 09:25:18 +0400
+Subject: [PATCH 06/11] Do not install Java sources
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 --
+ .../java_src/com/ericsson/otp/erlang/Makefile.otp | 2 --
+ 2 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+index f730749..f7ec624 100644
+--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
++++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+@@ -109,8 +109,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
+- $(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/com/ericsson/otp/ic
+ $(INSTALL_DIR) $(RELSYSDIR)/priv
+ $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+
+diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
+index d0ff9cd..9990d2b 100644
+--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
++++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
+@@ -99,8 +99,6 @@ release release_docs release_tests release_html:
+ $(MAKE) -f Makefile.otp $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE) $@_spec
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
+- $(INSTALL_DATA) $(JAVA_SRC) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
+ $(INSTALL_DIR) $(RELSYSDIR)/priv
+ $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
+
+--
+1.7.0.1
+
diff --git a/otp-0006-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch
deleted file mode 100644
index 37363de..0000000
--- a/otp-0006-Fix-check-for-compile-workspace-overflow.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001
-From: Michael Santos <michael.santos@gmail.com>
-Date: Thu, 18 Mar 2010 20:08:10 -0400
-Subject: [PATCH 6/7] Fix check for compile workspace overflow
-
-Patch from:
-http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch
-
-Test case:
-N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]).
-
-Compiling large regular expressions could overflow the workspace
-buffer. Modify the test to check for a value smaller than the buffer
-size.
----
- erts/emulator/pcre/pcre_compile.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c
-index 2974336..9508c5a 100644
---- a/erts/emulator/pcre/pcre_compile.c
-+++ b/erts/emulator/pcre/pcre_compile.c
-@@ -92,6 +92,11 @@ is 4 there is plenty of room. */
-
- #define COMPILE_WORK_SIZE (4096)
-
-+/* The overrun tests check for a slightly smaller size so that they detect the
-+overrun before it actually does run off the end of the data block. */
-+
-+#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
-+
-
- /* Table for handling escaped characters in the range '0'-'z'. Positive returns
- are simple data values; negative values are for special things like \d and so
-@@ -2445,7 +2450,7 @@ for (;; ptr++)
- #ifdef DEBUG
- if (code > cd->hwm) cd->hwm = code; /* High water info */
- #endif
-- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
-+ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */
- {
- *errorcodeptr = ERR52;
- goto FAILED;
-@@ -2494,7 +2499,7 @@ for (;; ptr++)
- /* In the real compile phase, just check the workspace used by the forward
- reference list. */
-
-- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)
-+ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
- {
- *errorcodeptr = ERR52;
- goto FAILED;
---
-1.6.6.1
-
diff --git a/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch b/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
new file mode 100644
index 0000000..b50bbb2
--- /dev/null
+++ b/otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
@@ -0,0 +1,1959 @@
+From 7741f154a2200d1d437991aa4148a99d6ba62f57 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 19 Jun 2010 09:29:12 +0400
+Subject: [PATCH 07/11] Do not install info files - they are almost empty and useless
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ 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 6322860..3f402fc 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 19be96d..59b39a3 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 d6788c1..acd4a89 100644
+--- a/lib/ssl/doc/src/Makefile
++++ b/lib/ssl/doc/src/Makefile
+@@ -66,7 +66,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) \
+@@ -124,7 +123,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
+--
+1.7.0.1
+
diff --git a/otp-0007-Install-missing-emacs-files.patch b/otp-0007-Install-missing-emacs-files.patch
deleted file mode 100644
index 389c517..0000000
--- a/otp-0007-Install-missing-emacs-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 09e0f9ec22f680c759feea2e90913128ce2a249d Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 28 Apr 2010 14:35:59 +0400
-Subject: [PATCH 7/7] Install missing emacs files
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
----
- lib/tools/emacs/Makefile | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
-index 7249263..17978de 100644
---- a/lib/tools/emacs/Makefile
-+++ b/lib/tools/emacs/Makefile
-@@ -38,7 +38,10 @@ MAN_FILES= \
-
- EMACS_FILES= \
- erlang-start \
-+ erlang-skels-old \
-+ erlang-skels \
- erlang-eunit \
-+ erlang_appwiz \
- erlang
-
- README_FILES= README
---
-1.6.6.1
-
diff --git a/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
new file mode 100644
index 0000000..d056cfa
--- /dev/null
+++ b/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -0,0 +1,68 @@
+From d44bca67743373ff6c4446f62cb7e54a14f150d5 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 19 Jun 2010 09:59:39 +0400
+Subject: [PATCH 08/11] Do not install nteventlog and related doc-files on non-win32 systems
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ lib/os_mon/doc/src/Makefile | 7 ++++++-
+ lib/os_mon/src/Makefile | 11 ++++++++++-
+ 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
+--- a/lib/os_mon/doc/src/Makefile
++++ b/lib/os_mon/doc/src/Makefile
+@@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+ # Target Specs
+ # ----------------------------------------------------
+ XML_APPLICATION_FILES = ref_man.xml
++ifeq ($(findstring win32,$(TARGET)),win32)
++NTEVENTLOG_DOCFILE=nteventlog.xml
++else
++NTEVENTLOG_DOCFILE=
++endif
+ XML_REF3_FILES = cpu_sup.xml \
+ disksup.xml \
+ memsup.xml \
+ os_mon_mib.xml \
+ os_sup.xml \
+- nteventlog.xml
++ $(NTEVENTLOG_DOCFILE)
+
+ XML_REF6_FILES = os_mon_app.xml
+
+diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
+index 9a75446..a492a63 100644
+--- a/lib/os_mon/src/Makefile
++++ b/lib/os_mon/src/Makefile
+@@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
+ # ----------------------------------------------------
+ # Target Specs
+ # ----------------------------------------------------
++ifeq ($(findstring win32,$(TARGET)),win32)
++NTEVENTLOG=nteventlog
++else
++NTEVENTLOG=
++endif
+ MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
+- nteventlog
++ $(NTEVENTLOG)
+
+ INCLUDE=../include
+ CSRC=../c_src
+@@ -78,7 +83,11 @@ docs:
+ # ----------------------------------------------------
+
+ $(APP_TARGET): $(APP_SRC) ../vsn.mk
++ifeq ($(findstring win32,$(TARGET)),win32)
+ sed -e 's;%VSN%;$(VSN);' $< > $@
++else
++ sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@
++endif
+
+ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ sed -e 's;%VSN%;$(VSN);' $< > $@
+--
+1.7.0.1
+
diff --git a/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch b/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
new file mode 100644
index 0000000..ee6a4b2
--- /dev/null
+++ b/otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
@@ -0,0 +1,55 @@
+From 93181c4ef2ddac536849c1abb36ab4a2dd16efba Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 19 Jun 2010 10:25:29 +0400
+Subject: [PATCH 09/11] Do not install *.bat files on non-win32 machines
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ lib/observer/src/Makefile | 8 ++++++--
+ lib/webtool/priv/Makefile | 8 ++++++--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
+index dde1ea1..fe5eba1 100644
+--- a/lib/observer/src/Makefile
++++ b/lib/observer/src/Makefile
+@@ -56,11 +56,15 @@ 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
++else
++WIN32_EXECUTABLES=
++endif
+ EXECUTABLES= \
+ $(BINDIR)/etop \
+ $(BINDIR)/getop \
+- $(BINDIR)/etop.bat \
+- $(BINDIR)/getop.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
+--- a/lib/webtool/priv/Makefile
++++ b/lib/webtool/priv/Makefile
+@@ -39,8 +39,12 @@ HTDOCS_FILES = root/doc/index.html \
+ root/doc/tool_management.html \
+ root/doc/start_info.html
+
+-SCRIPTS = bin/start_webtool \
+- bin/start_webtool.bat
++ifeq ($(findstring win32,$(TARGET)),win32)
++WIN32_SCRIPTS= bin/start.bat
++else
++WIN32_SCRIPTS=
++endif
++SCRIPTS = bin/start_webtool $(WIN32_SCRIPTS)
+
+ # ----------------------------------------------------
+ # FLAGS
+--
+1.7.0.1
+
diff --git a/otp-0010-Do-not-install-VxWorks-specific-docs.patch b/otp-0010-Do-not-install-VxWorks-specific-docs.patch
new file mode 100644
index 0000000..bddcf6a
--- /dev/null
+++ b/otp-0010-Do-not-install-VxWorks-specific-docs.patch
@@ -0,0 +1,25 @@
+From eb99892461faffaaa9156eeb78fa905175de4a79 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 19 Jun 2010 11:26:04 +0400
+Subject: [PATCH 10/11] Do not install VxWorks-specific docs
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ erts/doc/src/Makefile | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
+index be99288..4bb07c4 100644
+--- a/erts/doc/src/Makefile
++++ b/erts/doc/src/Makefile
+@@ -46,7 +46,6 @@ XML_REF1_FILES = epmd.xml \
+ XML_REF3_FILES = \
+ driver_entry.xml \
+ erl_nif.xml \
+- erl_set_memory_block.xml \
+ erl_driver.xml \
+ erl_prim_loader.xml \
+ erlang.xml \
+--
+1.7.0.1
+
diff --git a/otp-0011-Do-not-install-erlang-sources.patch b/otp-0011-Do-not-install-erlang-sources.patch
new file mode 100644
index 0000000..cfae1a6
--- /dev/null
+++ b/otp-0011-Do-not-install-erlang-sources.patch
@@ -0,0 +1,1072 @@
+From 2eabfcf4bbbf8d809c2c58926634ba3f0a8200ab Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 19 Jun 2010 13:21:10 +0400
+Subject: [PATCH 11/11] Do not install erlang sources
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ erts/preloaded/src/Makefile | 2 --
+ lib/appmon/src/Makefile | 2 +-
+ lib/asn1/src/Makefile | 2 +-
+ lib/common_test/src/Makefile | 2 +-
+ lib/compiler/src/Makefile | 4 ++--
+ lib/cosEvent/src/Makefile | 2 +-
+ lib/cosEventDomain/src/Makefile | 2 +-
+ lib/cosFileTransfer/src/Makefile | 3 +--
+ lib/cosNotification/src/Makefile | 3 +--
+ lib/cosProperty/src/Makefile | 3 +--
+ lib/cosTime/src/Makefile | 3 +--
+ lib/cosTransactions/src/Makefile | 2 +-
+ lib/crypto/src/Makefile | 2 --
+ lib/debugger/src/Makefile | 2 +-
+ lib/dialyzer/src/Makefile | 2 +-
+ lib/docbuilder/src/Makefile | 2 +-
+ lib/edoc/src/Makefile | 2 +-
+ lib/et/src/Makefile | 1 -
+ lib/eunit/src/Makefile | 2 --
+ lib/gs/src/Makefile | 4 ++--
+ lib/hipe/cerl/Makefile | 2 +-
+ lib/hipe/flow/Makefile | 2 +-
+ lib/hipe/icode/Makefile | 2 +-
+ lib/hipe/main/Makefile | 2 +-
+ lib/hipe/misc/Makefile | 2 +-
+ lib/hipe/rtl/Makefile | 2 +-
+ lib/hipe/util/Makefile | 3 ---
+ lib/ic/src/Makefile | 2 +-
+ lib/inets/src/ftp/Makefile | 2 +-
+ lib/inets/src/http_client/Makefile | 2 +-
+ lib/inets/src/http_lib/Makefile | 2 +-
+ lib/inets/src/http_server/Makefile | 2 +-
+ lib/inets/src/inets_app/Makefile | 2 +-
+ lib/inets/src/tftp/Makefile | 2 +-
+ lib/inviso/src/Makefile | 2 --
+ lib/kernel/src/Makefile | 1 -
+ lib/megaco/src/app/Makefile | 2 +-
+ lib/megaco/src/binary/Makefile | 2 +-
+ lib/megaco/src/engine/Makefile | 2 +-
+ lib/megaco/src/flex/Makefile.in | 1 -
+ lib/megaco/src/tcp/Makefile | 2 +-
+ lib/megaco/src/text/Makefile | 2 +-
+ lib/megaco/src/udp/Makefile | 2 +-
+ lib/mnesia/src/Makefile | 2 +-
+ lib/observer/src/Makefile | 1 -
+ lib/odbc/src/Makefile | 2 +-
+ lib/orber/COSS/CosNaming/Makefile | 4 ++--
+ lib/orber/src/Makefile | 2 +-
+ lib/os_mon/src/Makefile | 1 -
+ lib/otp_mibs/src/Makefile | 2 --
+ lib/parsetools/src/Makefile | 2 --
+ lib/percept/src/Makefile | 2 --
+ lib/pman/src/Makefile | 2 +-
+ lib/public_key/src/Makefile | 4 ----
+ lib/reltool/src/Makefile | 2 +-
+ lib/runtime_tools/src/Makefile | 2 --
+ lib/sasl/src/Makefile | 1 -
+ lib/snmp/src/agent/Makefile | 2 +-
+ lib/snmp/src/app/Makefile | 2 +-
+ lib/snmp/src/compile/Makefile | 2 +-
+ lib/snmp/src/manager/Makefile | 2 +-
+ lib/snmp/src/misc/Makefile | 2 +-
+ lib/ssh/src/Makefile | 2 +-
+ lib/ssl/src/Makefile | 2 +-
+ lib/stdlib/src/Makefile | 1 -
+ lib/syntax_tools/src/Makefile | 2 --
+ lib/test_server/src/Makefile | 1 -
+ lib/toolbar/src/Makefile | 2 +-
+ lib/tools/src/Makefile | 2 +-
+ lib/tv/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(-)
+
+diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
+index 785ad53..57a58ab 100644
+--- a/erts/preloaded/src/Makefile
++++ b/erts/preloaded/src/Makefile
+@@ -86,8 +86,6 @@ cancel:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec:
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile
+index 43f4f08..7e2d9b1 100644
+--- a/lib/appmon/src/Makefile
++++ b/lib/appmon/src/Makefile
+@@ -93,7 +93,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
+index 2733cde..42a674e 100644
+--- a/lib/asn1/src/Makefile
++++ b/lib/asn1/src/Makefile
+@@ -155,7 +155,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/examples
+ $(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples
+
+diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
+index 027667e..ff6a319 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
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
+index 0f6d2f6..9ee17e5 100644
+--- a/lib/compiler/src/Makefile
++++ b/lib/compiler/src/Makefile
+@@ -160,8 +160,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
+- $(YRL_FILE) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
++ $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
+index ba6e2b1..50a73d9 100644
+--- a/lib/cosEvent/src/Makefile
++++ b/lib/cosEvent/src/Makefile
+@@ -199,7 +199,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
+index 884c8f1..9c36cc1 100644
+--- a/lib/cosEventDomain/src/Makefile
++++ b/lib/cosEventDomain/src/Makefile
+@@ -165,7 +165,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
+index 773ed7f..8f79d8c 100644
+--- a/lib/cosFileTransfer/src/Makefile
++++ b/lib/cosFileTransfer/src/Makefile
+@@ -174,8 +174,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
+index 637c633..659b780 100644
+--- a/lib/cosNotification/src/Makefile
++++ b/lib/cosNotification/src/Makefile
+@@ -361,8 +361,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
+index 1d2119d..a210fec 100644
+--- a/lib/cosProperty/src/Makefile
++++ b/lib/cosProperty/src/Makefile
+@@ -175,8 +175,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
+index 3b6f7ba..f66e548 100644
+--- a/lib/cosTime/src/Makefile
++++ b/lib/cosTime/src/Makefile
+@@ -197,8 +197,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
+index 7e10ec1..4485209 100644
+--- a/lib/cosTransactions/src/Makefile
++++ b/lib/cosTransactions/src/Makefile
+@@ -168,7 +168,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
+index 0e886ce..d24ab24 100644
+--- a/lib/crypto/src/Makefile
++++ b/lib/crypto/src/Makefile
+@@ -83,8 +83,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
+ $(APPUP_TARGET) $(RELSYSDIR)/ebin
+diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
+index 8551fe8..244d169 100644
+--- a/lib/debugger/src/Makefile
++++ b/lib/debugger/src/Makefile
+@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
+index 810f86d..f3f2b22 100644
+--- a/lib/dialyzer/src/Makefile
++++ b/lib/dialyzer/src/Makefile
+@@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
++ $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
+ $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
+diff --git a/lib/docbuilder/src/Makefile b/lib/docbuilder/src/Makefile
+index e8a07a5..d0ac3a9 100644
+--- a/lib/docbuilder/src/Makefile
++++ b/lib/docbuilder/src/Makefile
+@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(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
+--- a/lib/edoc/src/Makefile
++++ b/lib/edoc/src/Makefile
+@@ -87,7 +87,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+
+ release_docs_spec:
+
+diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
+index bb6632e..3e71e02 100644
+--- a/lib/et/src/Makefile
++++ b/lib/et/src/Makefile
+@@ -108,7 +108,6 @@ release_spec: opt
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
+index 4897c20..f3d69e9 100644
+--- a/lib/eunit/src/Makefile
++++ b/lib/eunit/src/Makefile
+@@ -104,8 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include
+
+diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
+index a648d3c..3757ac1 100644
+--- a/lib/gs/src/Makefile
++++ b/lib/gs/src/Makefile
+@@ -106,8 +106,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
+- $(GSTK_GENERIC) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \
++ $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/bitmap
+diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
+index 7fcc44d..6e41e6b 100644
+--- a/lib/hipe/cerl/Makefile
++++ b/lib/hipe/cerl/Makefile
+@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/cerl
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/cerl
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/cerl
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
+index 02f6105..9fa7078 100644
+--- a/lib/hipe/flow/Makefile
++++ b/lib/hipe/flow/Makefile
+@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/flow
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow
++ $(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
+index eced90b..e48c64e 100644
+--- a/lib/hipe/icode/Makefile
++++ b/lib/hipe/icode/Makefile
+@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/icode
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/icode
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/icode
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
+index a14c9c3..163bded 100644
+--- a/lib/hipe/main/Makefile
++++ b/lib/hipe/main/Makefile
+@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DATA) ../vsn.mk $(RELSYSDIR)
+ $(INSTALL_DIR) $(RELSYSDIR)/main
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/main
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/main
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
+index 98a69d6..23073cd 100644
+--- a/lib/hipe/misc/Makefile
++++ b/lib/hipe/misc/Makefile
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/misc
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/misc
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/misc
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
+index 55d20af..04d667c 100644
+--- a/lib/hipe/rtl/Makefile
++++ b/lib/hipe/rtl/Makefile
+@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/rtl
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/rtl
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/rtl
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
+index 85719ec..ae2cbc0 100644
+--- a/lib/hipe/util/Makefile
++++ b/lib/hipe/util/Makefile
+@@ -49,7 +49,6 @@ HIPE_MODULES =
+ endif
+ MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES)
+
+-HRL_FILES=
+ ERL_FILES= $(MODULES:%=%.erl)
+ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
+@@ -100,8 +99,6 @@ $(DOCS)/%.html:%.erl
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/util
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/util
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
+index 5dac304..381cafe 100644
+--- a/lib/ic/src/Makefile
++++ b/lib/ic/src/Makefile
+@@ -199,7 +199,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/examples
+ $(INSTALL_DIR) $(RELSYSDIR)/examples/c-client
+ $(INSTALL_DATA) $(CCL_EX_FILES) $(RELSYSDIR)/examples/c-client
+diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
+index 19b9387..f3ff8bf 100644
+--- a/lib/inets/src/ftp/Makefile
++++ b/lib/inets/src/ftp/Makefile
+@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/ftp
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/ftp
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/ftp
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
+index 575c6ef..9531676 100644
+--- a/lib/inets/src/http_client/Makefile
++++ b/lib/inets/src/http_client/Makefile
+@@ -93,7 +93,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/http_client
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_client
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_client
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
+index 5dac3b0..9ca3a60 100644
+--- a/lib/inets/src/http_lib/Makefile
++++ b/lib/inets/src/http_lib/Makefile
+@@ -88,7 +88,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/http_lib
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_lib
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
+index 879e605..89ed618 100644
+--- a/lib/inets/src/http_server/Makefile
++++ b/lib/inets/src/http_server/Makefile
+@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/http_server
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_server
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_server
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
+index 4632ff3..6014db2 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
+ 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_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
++++ b/lib/inets/src/tftp/Makefile
+@@ -88,7 +88,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/tftp
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/tftp
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/inviso/src/Makefile b/lib/inviso/src/Makefile
+index 1f2f8b1..9f7652d 100644
+--- a/lib/inviso/src/Makefile
++++ b/lib/inviso/src/Makefile
+@@ -87,8 +87,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ # $(INSTALL_DIR) $(RELSYSDIR)/include
+ # $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
+index 9db6014..55e0085 100644
+--- a/lib/kernel/src/Makefile
++++ b/lib/kernel/src/Makefile
+@@ -196,7 +196,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
+index 01dfb9b..c6a631d 100644
+--- a/lib/megaco/src/app/Makefile
++++ b/lib/megaco/src/app/Makefile
+@@ -113,7 +113,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/app
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
+
+diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
+index d594f34..6614599 100644
+--- a/lib/megaco/src/binary/Makefile
++++ b/lib/megaco/src/binary/Makefile
+@@ -198,7 +198,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/binary
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) $(RELSYSDIR)/src/binary
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/binary
+
+
+ release_docs_spec:
+diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
+index 3943f4b..879abff 100644
+--- a/lib/megaco/src/engine/Makefile
++++ b/lib/megaco/src/engine/Makefile
+@@ -92,7 +92,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/engine
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+
+
+diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
+index 2ccf2a9..985bec2 100644
+--- a/lib/megaco/src/flex/Makefile.in
++++ b/lib/megaco/src/flex/Makefile.in
+@@ -276,7 +276,6 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src/flex
+ $(INSTALL_DIR) $(RELSYSDIR)/priv/lib
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
+ $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex
+diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
+index 0bd4b7c..8675d1b 100644
+--- a/lib/megaco/src/tcp/Makefile
++++ b/lib/megaco/src/tcp/Makefile
+@@ -93,7 +93,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/tcp
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp
+
+
+ release_docs_spec:
+diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
+index b2e8e76..bdb9c00 100644
+--- a/lib/megaco/src/text/Makefile
++++ b/lib/megaco/src/text/Makefile
+@@ -134,7 +134,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(BEAM_TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/text
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text
+
+
+ release_docs_spec:
+diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
+index 64b6478..5cf0fe2 100644
+--- a/lib/megaco/src/udp/Makefile
++++ b/lib/megaco/src/udp/Makefile
+@@ -93,7 +93,7 @@ release_spec: opt
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/udp
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp
+
+
+ release_docs_spec:
+diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
+index e032f56..e357187 100644
+--- a/lib/mnesia/src/Makefile
++++ b/lib/mnesia/src/Makefile
+@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
+index fe5eba1..fa5f2d0 100644
+--- a/lib/observer/src/Makefile
++++ b/lib/observer/src/Makefile
+@@ -113,7 +113,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
+index b48dd76..deb9947 100644
+--- a/lib/odbc/src/Makefile
++++ b/lib/odbc/src/Makefile
+@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
+index d3deec7..80be6e9 100644
+--- a/lib/orber/COSS/CosNaming/Makefile
++++ b/lib/orber/COSS/CosNaming/Makefile
+@@ -142,8 +142,8 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming
+- $(INSTALL_DATA) $(GEN_FILES) $(RELSYSDIR)/COSS/CosNaming
++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming
++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) $(RELSYSDIR)/COSS/CosNaming
+
+
+ release_docs_spec:
+diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
+index ccc4493..41e7972 100644
+--- a/lib/orber/src/Makefile
++++ b/lib/orber/src/Makefile
+@@ -258,7 +258,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) $(RELSYSDIR)/include
+
+diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
+index a492a63..77e7a06 100644
+--- a/lib/os_mon/src/Makefile
++++ b/lib/os_mon/src/Makefile
+@@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
+index 833a439..257e294 100644
+--- a/lib/otp_mibs/src/Makefile
++++ b/lib/otp_mibs/src/Makefile
+@@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGETS) $(RELSYSDIR)/ebin
+
+diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
+index 89e079e..1093f4f 100644
+--- a/lib/parsetools/src/Makefile
++++ b/lib/parsetools/src/Makefile
+@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
+index 5dfc725..a8a1718 100644
+--- a/lib/percept/src/Makefile
++++ b/lib/percept/src/Makefile
+@@ -93,8 +93,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ # $(INSTALL_DIR) $(RELSYSDIR)/include
+ # $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile
+index e573e57..bdbced1 100644
+--- a/lib/pman/src/Makefile
++++ b/lib/pman/src/Makefile
+@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
+index c30399f..36a5020 100644
+--- a/lib/public_key/src/Makefile
++++ b/lib/public_key/src/Makefile
+@@ -47,8 +47,6 @@ MODULES = \
+
+ HRL_FILES = $(INCLUDE)/public_key.hrl
+
+-INTERNAL_HRL_FILES =
+-
+ ERL_FILES = $(MODULES:%=%.erl)
+
+ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+@@ -101,8 +99,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
+index 4e6a112..cef22b5 100644
+--- a/lib/reltool/src/Makefile
++++ b/lib/reltool/src/Makefile
+@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
+index 4f831f3..c8bd229 100644
+--- a/lib/runtime_tools/src/Makefile
++++ b/lib/runtime_tools/src/Makefile
+@@ -92,8 +92,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
+index 9a5d1e4..4dd511f 100644
+--- a/lib/sasl/src/Makefile
++++ b/lib/sasl/src/Makefile
+@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
+index a67fe4d..012e8be 100644
+--- a/lib/snmp/src/agent/Makefile
++++ b/lib/snmp/src/agent/Makefile
+@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/agent
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/agent
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/agent
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ $(RELSYSDIR)/ebin
+diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
+index d89eb4e..2adf916 100644
+--- a/lib/snmp/src/app/Makefile
++++ b/lib/snmp/src/app/Makefile
+@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/app
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/app
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/app
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ $(RELSYSDIR)/ebin
+diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
+index 4be60e1..df7ed2d 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
+ 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) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
+index c1d5703..568530d 100644
+--- a/lib/snmp/src/manager/Makefile
++++ b/lib/snmp/src/manager/Makefile
+@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/manager
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/manager
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/manager
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ # $(INSTALL_DIR) $(RELSYSDIR)/include
+diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
+index 48d76bd..9f1f868 100644
+--- a/lib/snmp/src/misc/Makefile
++++ b/lib/snmp/src/misc/Makefile
+@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/misc
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/misc
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/misc
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ # $(INSTALL_DIR) $(RELSYSDIR)/include
+diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
+index 42880fa..d657098 100644
+--- a/lib/ssh/src/Makefile
++++ b/lib/ssh/src/Makefile
+@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
+index 7514ad2..c8be1ae 100644
+--- a/lib/ssl/src/Makefile
++++ b/lib/ssl/src/Makefile
+@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
+ $(APPUP_TARGET) $(RELSYSDIR)/ebin
+diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
+index 600303d..c335586 100644
+--- a/lib/stdlib/src/Makefile
++++ b/lib/stdlib/src/Makefile
+@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
+index 50369e6..12c6db4 100644
+--- a/lib/syntax_tools/src/Makefile
++++ b/lib/syntax_tools/src/Makefile
+@@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src
+
+ release_docs_spec:
+
+diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
+index d55a3a5..9b03f8f 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
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile
+index 14e1451..d71e18b 100644
+--- a/lib/toolbar/src/Makefile
++++ b/lib/toolbar/src/Makefile
+@@ -85,7 +85,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
+index 360f4f8..22deb2f 100644
+--- a/lib/tools/src/Makefile
++++ b/lib/tools/src/Makefile
+@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ $(RELSYSDIR)/ebin
+diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile
+index 457b9d3..1d2c97c 100644
+--- a/lib/tv/src/Makefile
++++ b/lib/tv/src/Makefile
+@@ -127,7 +127,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
+index 9c9ef61..db92881 100644
+--- a/lib/typer/src/Makefile
++++ b/lib/typer/src/Makefile
+@@ -113,7 +113,7 @@ 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
+ $(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
++++ b/lib/webtool/src/Makefile
+@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+ include $(ERL_TOP)/make/otp_release_targets.mk
+
+ release_spec: opt
+- $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ $(RELSYSDIR)/ebin
+diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
+index a9fd468..9b7f844 100644
+--- a/lib/wx/src/Makefile
++++ b/lib/wx/src/Makefile
+@@ -113,9 +113,9 @@ ifeq ($(INSIDE_ERLSRC), true)
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/src/gen
+- $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) $(RELSYSDIR)/src/gen
++ $(INSTALL_DATA) $(GEN_HRL) $(RELSYSDIR)/src/gen
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
+index 7009b50..c9c7303 100644
+--- a/lib/xmerl/src/Makefile
++++ b/lib/xmerl/src/Makefile
+@@ -218,9 +218,7 @@ release_spec: opt
+ $(INSTALL_DIR) $(RELSYSDIR)/ebin
+ $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ $(INSTALL_DIR) $(RELSYSDIR)/src
+- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src
+- $(INSTALL_DATA) xmerl_xpath_parse.yrl $(RELSYSDIR)/src
+- $(INSTALL_DATA) xmerl_b64Bin.yrl $(RELSYSDIR)/src
++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/include
+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
+
+--
+1.7.0.1
+
diff --git a/otp-links.patch b/otp-links.patch
deleted file mode 100644
index 6c8b227..0000000
--- a/otp-links.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200
-+++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200
-@@ -545,10 +545,6 @@
- # Install erlang base public files
- #
- install.bin:
-- for file in $(ERL_BASE_PUB_FILES); do \
-- rm -f $(BINDIR)/$$file; \
-- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \
-- done
-
- #
- # Directories needed before we can install
diff --git a/sources b/sources
index 2216c4f..23c50b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca6da4921e438891967900aa6a084341 otp_src_R13B04.tar.gz
+a24873bbace9ab3c307f3d2492d9e134 otp_src_R14A.tar.gz