Make install-infos safe against --exclude-docs.

Filter bogus req/prov.
Add dirlist.

2 files changed, 28 insertions, 2 deletions

diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add
index 2d3cace242..ba8c72cb77 100644
--- a/contrib/crossrpms/autotools/automake.add
+++ b/contrib/crossrpms/autotools/automake.add
@@ -42,6 +42,24 @@ standards.
 %prep
 %setup -q -n automake-%{srcvers}
 
+# Work around rpm inserting bogus perl-module deps
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(Automake/d'
+EOF
+%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
+chmod +x %{__perl_provides}
+
+cat << \EOF > %{name}-requ
+#!/bin/sh
+%{__perl_requires} $* |\
+    sed -e '/^perl(Automake/d'
+EOF
+%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
+chmod +x %{__perl_requires}
+
+
 %build
 PATH=%{_bindir}:$PATH
 # Don't use %%configure, it replaces config.sub/config.guess with the 
@@ -64,6 +82,11 @@ do
   install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 done
 
+%if "%{_prefix}" != "/usr"
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
+echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
+%endif
+
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 touch $RPM_BUILD_ROOT%{_infodir}/dir
 
diff --git a/contrib/crossrpms/autotools/target-automake.add b/contrib/crossrpms/autotools/target-automake.add
index 1e6545e058..4658da4c8f 100644
--- a/contrib/crossrpms/autotools/target-automake.add
+++ b/contrib/crossrpms/autotools/target-automake.add
@@ -1,9 +1,9 @@
 %post 
-/sbin/install-info  --info-dir=%{_infodir} %{_infodir}/automake.info.gz
+/sbin/install-info  --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
 
 %preun
 if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz
+  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||:
 fi
 
 %files
@@ -19,6 +19,9 @@ fi
 %sysdir %{_mandir}/man1
 %{_mandir}/man1/*
 %sysdir %{_datadir}
+%if "%{_prefix}" != "/usr"
+%{_datadir}/aclocal
+%endif
 %{_datadir}/aclocal-%{amvers}
 %{_datadir}/automake-%{amvers}