2004-03-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* binutils/base-binutils.add: Apply _infodir.
	Don't install libiberty. Misc. cleanups.
	* binutils/binutils.add: Apply _infodir, _mandir.
	Don't install libiberty. Gzip man pages. Misc. cleanups.
	* binutils/target-binutils.add: Apply _mandir.

4 files changed, 48 insertions, 35 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index a2b35fb5b1..45d2b09d7b 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* binutils/base-binutils.add: Apply _infodir.
+	Don't install libiberty. Misc. cleanups.
+	* binutils/binutils.add: Apply _infodir, _mandir.
+	Don't install libiberty. Gzip man pages. Misc. cleanups.
+	* binutils/target-binutils.add: Apply _mandir.
+
 2004-03-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* autotools/automake-rtems.spec.in: Upgrade to 1.8.3.
diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add
index 3ca07d1182..f9d2141d43 100644
--- a/scripts/binutils/base-binutils.add
+++ b/scripts/binutils/base-binutils.add
@@ -15,39 +15,43 @@ This is the base for binutils regardless of target CPU.
 %post -n %{rpmprefix}rtems@osversion@-base-binutils
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
     f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
     test x"$f" != x"" && for i in $f; do
-      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-binutils
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
     f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
     test x"$f" != x"" && for i in $f; do
-      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
-%files -n %{rpmprefix}rtems@osversion@-base-binutils -f files
+%files -n %{rpmprefix}rtems@osversion@-base-binutils
 %defattr(-,root,root)
 %dir %{_prefix}/info
-%doc %{_prefix}/info/dir
-%doc %{_prefix}/info/as.info*
-%doc %{_prefix}/info/bfd.info*
-%doc %{_prefix}/info/binutils.info*
-%doc %{_prefix}/info/ld.info*
+%doc %{_infodir}/dir
+%doc %{_infodir}/as.info*
+%doc %{_infodir}/bfd.info*
+%doc %{_infodir}/binutils.info*
+%doc %{_infodir}/ld.info*
 
 %if "%{binutils_version}" < "2.13"
-%doc %{_prefix}/info/gasp.info.gz
+%doc %{_infodir}/gasp.info*
 %endif
-%doc %{_prefix}/info/standards.info.gz
+%doc %{_infodir}/standards.info*
 
-%dir %{_prefix}/man
-%dir %{_prefix}/man/man1
+%if "%{binutils_version}" < "2.9.5"
+%doc %{_infodir}/configure.info*
+%endif
+
+# %dir %{_mandir}
+# %dir %{_mandir}/man1
 
 # deleted as of 2.13
 # %dir %{_prefix}/include
@@ -55,9 +59,8 @@ This is the base for binutils regardless of target CPU.
 # %{_prefix}/include/ansidecl.h
 # %{_prefix}/include/bfdlink.h
 
-%dir %{_prefix}/lib
-# deleted as of 2.13
-%{_prefix}/lib/libiberty*
+# %dir %{_prefix}/lib
+# %{_prefix}/lib/libiberty*
 # deleted as of 2.13
 # %{_prefix}/lib/libbfd*
 # %{_prefix}/lib/libopcodes*
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index 4c303331c3..7f51e20f9e 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -47,7 +47,8 @@ This is binutils sources with patches for RTEMS.
   ../binutils-%{binutils_version}/configure \
     --build=%_build --host=%_host \
     --target=%{binutils_target} \
-    --verbose --prefix=%{_prefix} --disable-nls
+    --verbose --disable-nls \
+    --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir}
 
   make all
   make info
@@ -55,31 +56,32 @@ This is binutils sources with patches for RTEMS.
 
 %install
   cd build
-  make prefix=$RPM_BUILD_ROOT%{_prefix} install
-  make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
+  make prefix=$RPM_BUILD_ROOT%{_prefix} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    infodir=$RPM_BUILD_ROOT%{_infodir} \
+    install
+  make prefix=$RPM_BUILD_ROOT%{_prefix} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    infodir=$RPM_BUILD_ROOT%{_infodir} \
+    install-info
 # A bug in binutils: binutils does not install share/locale
 # however it uses it
   ../binutils-%{binutils_version}/mkinstalldirs \
     $RPM_BUILD_ROOT%{_prefix}/share/locale
 
-#  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
 # gzip info files
-  gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
-  gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info-* 2>/dev/null
-
-  if test -f $RPM_BUILD_ROOT%{_prefix}/info/configure.info.gz;
-  then
-# These are only present in binutils >= 2.9.5
-    find $RPM_BUILD_ROOT%{_prefix}/info -name 'configure.*' | \
-      sed -e "s,^$RPM_BUILD_ROOT,,g" > ../files
-  else
-    touch ../files
-  fi
+  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info 2>/dev/null
+  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-* 2>/dev/null
 
 # We assume that info/dir exists when building the RPMs
-  rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   f=`find $RPM_BUILD_ROOT%{_prefix}/info -name '*.info.gz'`
   test x"$f" != x"" && for i in $f; do
-    /sbin/install-info $i $RPM_BUILD_ROOT%{_prefix}/info/dir
+    /sbin/install-info $i $RPM_BUILD_ROOT%{_infodir}/dir
   done
 
+# gzip man pages
+  gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null
+
+# We don't ship host files
+  rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty*
diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add
index 6694671321..6a41d8e9d0 100644
--- a/scripts/binutils/target-binutils.add
+++ b/scripts/binutils/target-binutils.add
@@ -15,7 +15,7 @@ This is the GNU binutils for RTEMS targetting %{binutils_target}.
 
 %files -n %{rpmprefix}%{binutils_target}-binutils
 %defattr(-,root,root)
-%doc %{_prefix}/man/man1/%{binutils_target}-*.1*
+%doc %{_mandir}/man1/%{binutils_target}-*.1*
 
 %dir %{_prefix}/bin
 %{_prefix}/bin/%{binutils_target}-addr2line%{_exeext}