diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-06-20 16:40:41 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-06-20 16:40:41 +0000 |
commit | e8a62363a7fa4439e9de9dab56c7a899c5821cad (patch) | |
tree | 632ad2781635e900bdc27763a5636615dac7df85 /contrib | |
parent | Use star to untar the sources (diff) | |
download | rtems-e8a62363a7fa4439e9de9dab56c7a899c5821cad.tar.bz2 |
Replace %{build_infos} with %build_infos.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/crossrpms/binutils/base-binutils.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/binutils/binutils.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/binutils/build.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/binutils/install.add | 4 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/base-g77.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/base-gcc.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/base-gcj.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/base-gfortran.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/base-gnat.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/base-newlib.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/build.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gcc/install.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/base-gdb.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/build.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/gdb.add | 2 | ||||
-rw-r--r-- | contrib/crossrpms/gdb/install.add | 4 |
16 files changed, 18 insertions, 18 deletions
diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add index 9d985823f7..9a0dd26d17 100644 --- a/contrib/crossrpms/binutils/base-binutils.add +++ b/contrib/crossrpms/binutils/base-binutils.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos # ============================================================== # rtems-base-binutils # ============================================================== diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add index fc837ca3cc..78501edcd7 100644 --- a/contrib/crossrpms/binutils/binutils.add +++ b/contrib/crossrpms/binutils/binutils.add @@ -12,7 +12,7 @@ License: GPL/LGPL URL: http://sources.redhat.com/binutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %{build_infos} +%if %build_infos # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add index ef001fc1ba..4c22c6a44a 100644 --- a/contrib/crossrpms/binutils/build.add +++ b/contrib/crossrpms/binutils/build.add @@ -15,7 +15,7 @@ --mandir=%{_mandir} --infodir=%{_infodir} make all -%if %{build_infos} +%if %build_infos make info %endif cd .. diff --git a/contrib/crossrpms/binutils/install.add b/contrib/crossrpms/binutils/install.add index 93c4a3a387..fa7ec2eb24 100644 --- a/contrib/crossrpms/binutils/install.add +++ b/contrib/crossrpms/binutils/install.add @@ -10,7 +10,7 @@ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -%if %{build_infos} +%if %build_infos make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ @@ -20,7 +20,7 @@ install-info %endif -%if %{build_infos} +%if %build_infos # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add index 3323a24abb..9b610dd17c 100644 --- a/contrib/crossrpms/gcc/base-g77.add +++ b/contrib/crossrpms/gcc/base-g77.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos %if %build_g77 # ============================================================== # rtems-base-g77 diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add index 6d4552f1fa..ace9b3eefe 100644 --- a/contrib/crossrpms/gcc/base-gcc.add +++ b/contrib/crossrpms/gcc/base-gcc.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos # ============================================================== # @rpmprefix@rtems@osversion@-base-gcc # ============================================================== diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add index 6e3f0daf27..421e50794f 100644 --- a/contrib/crossrpms/gcc/base-gcj.add +++ b/contrib/crossrpms/gcc/base-gcj.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos %if %build_gcj # ============================================================== # rtems-base-gcj diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add index 2e941b672b..73161781b3 100644 --- a/contrib/crossrpms/gcc/base-gfortran.add +++ b/contrib/crossrpms/gcc/base-gfortran.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos %if %build_f95 # ============================================================== # @rpmprefix@rtems@osversion@-base-gfortran diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add index 1545c01454..a89bd6a3ae 100644 --- a/contrib/crossrpms/gcc/base-gnat.add +++ b/contrib/crossrpms/gcc/base-gnat.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos %if %build_gnat # ============================================================== # rtems-base-gnat diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add index 0a0997a68e..9c53c273e8 100644 --- a/contrib/crossrpms/gcc/base-newlib.add +++ b/contrib/crossrpms/gcc/base-newlib.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos %if %build_newlib # ============================================================== # @rpmprefix@rtems@osversion@-base-newlib diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index d714d8fff8..b6ad14d060 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -57,7 +57,7 @@ %endif make all -%if %{build_infos} +%if %build_infos make info %endif cd .. diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 5482730a1d..0c06f608e1 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -34,7 +34,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext} %endif -%if %{build_infos} +%if %build_infos # We don't ship info/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add index 91f3772d12..80b38b4660 100644 --- a/contrib/crossrpms/gdb/base-gdb.add +++ b/contrib/crossrpms/gdb/base-gdb.add @@ -1,4 +1,4 @@ -%if %{build_infos} +%if %build_infos # ============================================================== # rtems-base-gdb # ============================================================== diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add index e1f58acc60..cbc375d15b 100644 --- a/contrib/crossrpms/gdb/build.add +++ b/contrib/crossrpms/gdb/build.add @@ -16,7 +16,7 @@ --mandir=%{_mandir} --infodir=%{_infodir} make all -%if %{build_infos} +%if %build_infos make info %endif cd .. diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index 20037d115e..ada517f2a2 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -12,7 +12,7 @@ License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %{build_infos} +%if %build_infos # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 diff --git a/contrib/crossrpms/gdb/install.add b/contrib/crossrpms/gdb/install.add index 03d928bcfb..2881252ee2 100644 --- a/contrib/crossrpms/gdb/install.add +++ b/contrib/crossrpms/gdb/install.add @@ -13,7 +13,7 @@ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -%if %{build_infos} +%if %build_infos make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ @@ -24,7 +24,7 @@ %endif %endif -%if %{build_infos} +%if %build_infos rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir |