diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-04-20 07:24:58 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-04-20 07:24:58 +0000 |
commit | d8fa12c3daa0ed950dcba08b363fe2b1d8a5a0b1 (patch) | |
tree | aa00a7ccf296673cf2edcf64c1131e154d91c52e /scripts | |
parent | 2005-04-20 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-d8fa12c3daa0ed950dcba08b363fe2b1d8a5a0b1.tar.bz2 |
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.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ChangeLog | 6 | ||||
-rw-r--r-- | scripts/gdb/base-gdb.add | 46 | ||||
-rw-r--r-- | scripts/gdb/gdb.add | 15 | ||||
-rw-r--r-- | scripts/gdb/target-gdb.add | 4 |
4 files changed, 36 insertions, 35 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 7a8ee4f1a3..3411a635d5 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,11 @@ 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. + +2005-04-20 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: chmod +x rtems/mkspec. * binutils/binutils.add: Remove Prefix. Use mkdir -p. diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add index 8b8bdde912..1afce1f80c 100644 --- a/scripts/gdb/base-gdb.add +++ b/scripts/gdb/base-gdb.add @@ -16,55 +16,41 @@ This is the base for gdb regardless of target CPU. %defattr(-,root,root) %dir %{_infodir} -%doc %{_infodir}/gdb.info* +%{_infodir}/gdb.info* + # FIXME: When had mmalloc.info been removed? %if "%{gdb_version}" < "6.3" -%doc %{_infodir}/mmalloc.info* +%{_infodir}/mmalloc.info* %endif # FIXME: When had gdbint and stabs been introduced? %if "%{gdb_version}" >= "5.0" -%doc %{_infodir}/gdbint.info* -%doc %{_infodir}/stabs.info* -%endif -# gdb 4.18 installed this, gdb 5.0 does not -%if "%{gdb_version}" < "5.0" -%doc %{_infodir}/readline.info* +%{_infodir}/gdbint.info* +%{_infodir}/stabs.info* %endif %if "{gdb_version}" >= "6.0" -%doc %{_infodir}/annotate.info* +%{_infodir}/annotate.info* %endif -%dir %{_prefix}/man -%dir %{_prefix}/man/man1 - -# %dir %{_prefix}/include -# We install libbfd from binutils -# %{_prefix}/include/bfd.h -# %{_prefix}/include/bfdlink.h - -%dir %{_prefix}/lib -# We install libbfd from binutils -# %{_prefix}/lib/libbfd* -# We use libiberty from gcc -# %{_prefix}/lib/libiberty* +%dir %{_mandir} +%dir %{_mandir}/man1 %post -n %{rpmprefix}rtems@osversion@-base-gdb - if test -d $RPM_INSTALL_PREFIX/rtems/info; + if test -d %{_infodir}; then - rm -f $RPM_INSTALL_PREFIX/rtems/info/dir - f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + rm -f %{_infodir}/dir + f=`find %{_infodir} -name '*.info.gz'` test -n "$f" && for i in $f; do - install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + install-info $i %{_infodir}/dir done fi %postun -n %{rpmprefix}rtems@osversion@-base-gdb - if test -d $RPM_INSTALL_PREFIX/rtems/info; + if test -d %{_infodir}; then - rm -f $RPM_INSTALL_PREFIX/rtems/info/dir - f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + rm -f %{_infodir}/dir + f=`find %{_infodir} -name '*.info.gz'` test -n "$f" && for i in $f; do - install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + install-info $i %{_infodir}/dir done fi diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index b34650bd3b..0ef5ce5f3d 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -86,13 +86,14 @@ cd .. # simargs="$simargs --enable-sim-inline" %endif -test -d build || mkdir build + mkdir -p build cd build export PATH="%{_bindir}:${PATH}" ../gdb-%{gdb_version}/configure \ --build=%_build --host=%_host \ --target=%{gdb_target} \ --prefix=%{_prefix} --bindir=%{_bindir} \ + --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} \ --verbose $simargs \ --disable-nls @@ -106,23 +107,31 @@ test -d build || mkdir build cd build make prefix=$RPM_BUILD_ROOT%{_prefix} \ 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} \ 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 # host files - rm -rf $RPM_BUILD_ROOT%{_prefix}/include/*.h - rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/lib*a + rm -rf $RPM_BUILD_ROOT%{_includedir}/*.h + rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*a # These come from other packages rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* + + # gdb 4.18 installed this, later versions don't + # Don't care about it, anymore + rm -rf $RPM_BUILD_ROOT%{_infodir}/readline.info* # gzip info files ls $RPM_BUILD_ROOT%{_infodir}/*.info \ diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add index bf8131d6c0..1207052595 100644 --- a/scripts/gdb/target-gdb.add +++ b/scripts/gdb/target-gdb.add @@ -14,9 +14,9 @@ This is the GNU gdb for RTEMS targetting %{gdb_target}. %files -n %{rpmprefix}%{gdb_target}-gdb %defattr(-,root,root) -%doc %{_mandir}/man1/%{gdb_target}-gdb.1* +%{_mandir}/man1/%{gdb_target}-gdb.1* %if "%_sim" == "1" -%doc %{_mandir}/man1/%{gdb_target}-run.1* +%{_mandir}/man1/%{gdb_target}-run.1* %endif %if "%{gdb_version}" >= "6.3" %{_mandir}/man1/%{gdb_target}-gdbtui.1* |