diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-03-10 13:44:30 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-03-10 13:44:30 +0000 |
| commit | 13501927ccdbde00a74efaa20e77afd21af854ae (patch) | |
| tree | 7769c7f8479df66f325e7ed056b83e5c28cc55b3 /contrib/crossrpms/gdb | |
| parent | Propagate build_infos to *.spec.ins (diff) | |
| download | rtems-13501927ccdbde00a74efaa20e77afd21af854ae.tar.bz2 | |
Use %build_infos
Diffstat (limited to 'contrib/crossrpms/gdb')
| -rw-r--r-- | contrib/crossrpms/gdb/base-gdb.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gdb/build.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gdb/gdb.add | 7 | ||||
| -rw-r--r-- | contrib/crossrpms/gdb/install.add | 10 |
4 files changed, 12 insertions, 11 deletions
diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add index dcb9e9f238..79bffb16d9 100644 --- a/contrib/crossrpms/gdb/base-gdb.add +++ b/contrib/crossrpms/gdb/base-gdb.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} # ============================================================== # rtems-base-gdb # ============================================================== diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add index 9452637127..b2831d465b 100644 --- a/contrib/crossrpms/gdb/build.add +++ b/contrib/crossrpms/gdb/build.add @@ -15,8 +15,8 @@ --mandir=%{_mandir} --infodir=%{_infodir} make all -#%if "%{_prefix}" != "/usr" +%if %{build_infos} make info -#%endif +%endif cd .. diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index ae65a13839..20037d115e 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -1,6 +1,8 @@ %define gdb_version @GDB_VERS@ %define gdb_rpmvers %{expand:%(echo @GDB_VERS@ | tr - _)} +%define build_infos @build_infos@ + Name: @rpmprefix@@tool_target@-gdb Summary: Gdb for target @tool_target@ Group: Development/Tools @@ -10,13 +12,12 @@ License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{_prefix}" != "/usr" +%if %{build_infos} # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 %endif -BuildRequires: flex -BuildRequires: bison +BuildRequires: ncurses-devel @SOURCES@ diff --git a/contrib/crossrpms/gdb/install.add b/contrib/crossrpms/gdb/install.add index 9236903741..c125190c8a 100644 --- a/contrib/crossrpms/gdb/install.add +++ b/contrib/crossrpms/gdb/install.add @@ -10,7 +10,7 @@ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -%if "%{_prefix}" != "/usr" +%if %{build_infos} make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ @@ -20,10 +20,7 @@ install-info %endif -%if "%{_prefix}" == "/usr" -# Conflict with a native gdb's infos - rm -rf $RPM_BUILD_ROOT%{_infodir} -%else +%if %{build_infos} rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir @@ -31,6 +28,9 @@ rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* +%else +# Conflict with a native gdb's infos + rm -rf $RPM_BUILD_ROOT%{_infodir} %endif # We don't ship host files |