2005-04-20 Ralf Corsepius <ralf.corsepius@rtems.org>

	* binutils/base-binutils.add, binutils/binutils.add,
	binutils/target-binutils.add: Introduce %{_includedir}, %{_libdir},
	%{_bindir}. Remove superfluous %doc. Misc. fixes.

4 files changed, 58 insertions, 59 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 3411a635d5..c0053b90a0 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,11 @@
 2005-04-20	Ralf Corsepius <ralf.corsepius@rtems.org>
 
+	* binutils/base-binutils.add, binutils/binutils.add,
+	binutils/target-binutils.add: Introduce %{_includedir}, %{_libdir},
+	%{_bindir}. Remove superfluous %doc. Misc. fixes.
+
+2005-04-20	Ralf Corsepius <ralf.corsepius@rtems.org>
+
 	* gdb/base-gdb.add, gdb/gdb.add, gdb/target-gdb.add:
 	Use mkdir -p. Introduce %{_includedir}, %{_libdir}. Remove
 	superfluous %doc.
diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add
index f9d2141d43..eca68ec14e 100644
--- a/scripts/binutils/base-binutils.add
+++ b/scripts/binutils/base-binutils.add
@@ -13,57 +13,37 @@ RTEMS is an open source operating system for embedded systems.
 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; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test x"$f" != x"" && for i in $f; do
-      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      /sbin/install-info $i %{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-binutils
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test x"$f" != x"" && for i in $f; do
-      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      /sbin/install-info $i %{_infodir}/dir
     done
   fi
 
 %files -n %{rpmprefix}rtems@osversion@-base-binutils
 %defattr(-,root,root)
-%dir %{_prefix}/info
-%doc %{_infodir}/dir
-%doc %{_infodir}/as.info*
-%doc %{_infodir}/bfd.info*
-%doc %{_infodir}/binutils.info*
-%doc %{_infodir}/ld.info*
+%dir %{_infodir}
+%{_infodir}/as.info*
+%{_infodir}/bfd.info*
+%{_infodir}/binutils.info*
+%{_infodir}/ld.info*
+%{_infodir}/standards.info*
 
 %if "%{binutils_version}" < "2.13"
-%doc %{_infodir}/gasp.info*
+%{_infodir}/gasp.info*
 %endif
-%doc %{_infodir}/standards.info*
-
-%if "%{binutils_version}" < "2.9.5"
-%doc %{_infodir}/configure.info*
-%endif
-
-# %dir %{_mandir}
-# %dir %{_mandir}/man1
-
-# deleted as of 2.13
-# %dir %{_prefix}/include
-# %{_prefix}/include/bfd.h
-# %{_prefix}/include/ansidecl.h
-# %{_prefix}/include/bfdlink.h
-
-# %dir %{_prefix}/lib
-# %{_prefix}/lib/libiberty*
-# deleted as of 2.13
-# %{_prefix}/lib/libbfd*
-# %{_prefix}/lib/libopcodes*
 
 %dir %{_prefix}/share
 %dir %{_prefix}/share/locale
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index b120e35d5c..66f3f585cd 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -51,7 +51,9 @@ cd ..
     --build=%_build --host=%_host \
     --target=%{binutils_target} \
     --verbose --disable-nls \
-    --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir}
+    --prefix=%{_prefix} --bindir=%{_bindir} \
+    --includedir=%{_includedir} --libdir=%{_libdir} \
+    --mandir=%{_mandir} --infodir=%{_infodir} \
 
   make all
   make info
@@ -62,20 +64,29 @@ cd ..
 
   cd build
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    bindir=$RPM_BUILD_ROOT%{_bindir} \
+    includedir=$RPM_BUILD_ROOT%{_includedir} \
+    libdir=$RPM_BUILD_ROOT%{_libdir} \
     infodir=$RPM_BUILD_ROOT%{_infodir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
     install
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    bindir=$RPM_BUILD_ROOT%{_bindir} \
+    includedir=$RPM_BUILD_ROOT%{_includedir} \
+    libdir=$RPM_BUILD_ROOT%{_libdir} \
     infodir=$RPM_BUILD_ROOT%{_infodir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
     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
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
+
+%if "%{binutils_version}" < "2.9.5"
+  rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
+%endif
 
 # gzip info files
-  # gzip info files
   ls $RPM_BUILD_ROOT%{_infodir}/*.info \
     $RPM_BUILD_ROOT%{_infodir}/*.info-? \
     $RPM_BUILD_ROOT%{_infodir}/*.info-?? 2>/dev/null \
@@ -85,7 +96,7 @@ cd ..
 
 # We assume that info/dir exists when building the RPMs
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  f=`find $RPM_BUILD_ROOT%{_prefix}/info -name '*.info.gz'`
+  f=`find $RPM_BUILD_ROOT%{_infodir} -name '*.info.gz'`
   test x"$f" != x"" && for i in $f; do
     /sbin/install-info $i $RPM_BUILD_ROOT%{_infodir}/dir
   done
@@ -94,4 +105,4 @@ cd ..
   gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null
 
 # We don't ship host files
-  rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty*
+  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add
index 04bae10e6a..8c8397a882 100644
--- a/scripts/binutils/target-binutils.add
+++ b/scripts/binutils/target-binutils.add
@@ -14,26 +14,28 @@ This is the GNU binutils for RTEMS targetting %{binutils_target}.
 
 %files -n %{rpmprefix}%{binutils_target}-binutils
 %defattr(-,root,root)
-%doc %{_mandir}/man1/%{binutils_target}-*.1*
+%dir %{_mandir}
+%dir %{_mandir}/man1
+%{_mandir}/man1/%{binutils_target}-*.1*
 
-%dir %{_prefix}/bin
-%{_prefix}/bin/%{binutils_target}-addr2line%{_exeext}
-%{_prefix}/bin/%{binutils_target}-ar%{_exeext}
-%{_prefix}/bin/%{binutils_target}-as%{_exeext}
-%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
+%dir %{_bindir}
+%{_bindir}/%{binutils_target}-addr2line%{_exeext}
+%{_bindir}/%{binutils_target}-ar%{_exeext}
+%{_bindir}/%{binutils_target}-as%{_exeext}
+%{_bindir}/%{binutils_target}-c++filt%{_exeext}
 %if "%{binutils_version}" < "2.13"
 # deleted as of 2.13
-%{_prefix}/bin/%{binutils_target}-gasp%{_exeext}
+%{_bindir}/%{binutils_target}-gasp%{_exeext}
 %endif
-%{_prefix}/bin/%{binutils_target}-ld%{_exeext}
-%{_prefix}/bin/%{binutils_target}-nm%{_exeext}
-%{_prefix}/bin/%{binutils_target}-objcopy%{_exeext}
-%{_prefix}/bin/%{binutils_target}-objdump%{_exeext}
-%{_prefix}/bin/%{binutils_target}-ranlib%{_exeext}
-%{_prefix}/bin/%{binutils_target}-readelf%{_exeext}
-%{_prefix}/bin/%{binutils_target}-size%{_exeext}
-%{_prefix}/bin/%{binutils_target}-strings%{_exeext}
-%{_prefix}/bin/%{binutils_target}-strip%{_exeext}
+%{_bindir}/%{binutils_target}-ld%{_exeext}
+%{_bindir}/%{binutils_target}-nm%{_exeext}
+%{_bindir}/%{binutils_target}-objcopy%{_exeext}
+%{_bindir}/%{binutils_target}-objdump%{_exeext}
+%{_bindir}/%{binutils_target}-ranlib%{_exeext}
+%{_bindir}/%{binutils_target}-readelf%{_exeext}
+%{_bindir}/%{binutils_target}-size%{_exeext}
+%{_bindir}/%{binutils_target}-strings%{_exeext}
+%{_bindir}/%{binutils_target}-strip%{_exeext}
 
 %dir %{_prefix}/%{binutils_target}
 %dir %{_prefix}/%{binutils_target}/bin