From c3af37cb1fd726057c93392e1eab4d9c4b3e81c0 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 17 Mar 2006 13:13:46 +0000 Subject: Use %sysdir instead of %if %_prefix ==|!= /usr --- contrib/crossrpms/binutils/base-binutils.add | 6 +++--- contrib/crossrpms/binutils/target-binutils.add | 10 +++------- contrib/crossrpms/gcc/base-g77.add | 2 +- contrib/crossrpms/gcc/base-gcc.add | 8 ++++---- contrib/crossrpms/gcc/base-gcj.add | 8 ++++---- contrib/crossrpms/gcc/base-gfortran.add | 2 +- contrib/crossrpms/gcc/base-gnat.add | 4 ++-- contrib/crossrpms/gcc/base-newlib.add | 2 +- contrib/crossrpms/gcc/target-gcc.add | 10 +++------- contrib/crossrpms/gcc/target-newlib.add | 4 +--- contrib/crossrpms/gdb/base-gdb.add | 2 +- contrib/crossrpms/gdb/target-gdb.add | 10 +++------- 12 files changed, 27 insertions(+), 41 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add index 4a805aefb6..9d985823f7 100644 --- a/contrib/crossrpms/binutils/base-binutils.add +++ b/contrib/crossrpms/binutils/base-binutils.add @@ -38,7 +38,7 @@ fi %files -n @rpmprefix@rtems@osversion@-base-binutils %defattr(-,root,root) -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/as.info* %{_infodir}/bfd.info* @@ -50,7 +50,7 @@ fi %{_infodir}/gasp.info* %endif -%dir %{_prefix}/share -%dir %{_prefix}/share/locale +%sysdir %{_prefix}/share +%sysdir %{_prefix}/share/locale %endif diff --git a/contrib/crossrpms/binutils/target-binutils.add b/contrib/crossrpms/binutils/target-binutils.add index 4a1fa5f96a..6211d0a737 100644 --- a/contrib/crossrpms/binutils/target-binutils.add +++ b/contrib/crossrpms/binutils/target-binutils.add @@ -12,15 +12,11 @@ GNU binutils targetting @tool_target@. %files -n @rpmprefix@@tool_target@-binutils %defattr(-,root,root) -%if "%{_prefix}" != "/usr" -%dir %{_mandir} -%dir %{_mandir}/man1 -%endif +%sysdir %{_mandir} +%sysdir %{_mandir}/man1 %{_mandir}/man1/@tool_target@-*.1* -%if "%{_prefix}" != "/usr" -%dir %{_bindir} -%endif +%sysdir %{_bindir} %{_bindir}/@tool_target@-* %dir %{_prefix}/@tool_target@ diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add index 42e9703585..3323a24abb 100644 --- a/contrib/crossrpms/gcc/base-g77.add +++ b/contrib/crossrpms/gcc/base-g77.add @@ -19,7 +19,7 @@ This is the files for gcc/g77 that are shared by all targets. %files -n @rpmprefix@rtems@osversion@-base-g77 %defattr(-,root,root) -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/g77.info*.gz diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add index a60a983328..6d4552f1fa 100644 --- a/contrib/crossrpms/gcc/base-gcc.add +++ b/contrib/crossrpms/gcc/base-gcc.add @@ -17,7 +17,7 @@ GCC files that are shared by all targets. %files -n @rpmprefix@rtems@osversion@-base-gcc %defattr(-,root,root) -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/cpp.info* %{_infodir}/cppinternals.info* @@ -27,13 +27,13 @@ GCC files that are shared by all targets. %{_infodir}/gccinstall.info* %endif -%dir %{_mandir} +%sysdir %{_mandir} %if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 +%sysdir %{_mandir}/man1 %{_mandir}/man1/cpp.1* %{_mandir}/man1/gcov.1* %endif -%dir %{_mandir}/man7 +%sysdir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* %{_mandir}/man7/gpl.7* diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add index 91dfb63890..6e3f0daf27 100644 --- a/contrib/crossrpms/gcc/base-gcj.add +++ b/contrib/crossrpms/gcc/base-gcj.add @@ -20,12 +20,12 @@ This is the files for gcc/java (gcj) that are shared by all targets. %files -n @rpmprefix@rtems@osversion@-base-gcj %defattr(-,root,root) %if "%{gcc_version}" <= "3.4" -%dir %{_bindir} +%sysdir %{_bindir} %{_bindir}/jar%{_exeext} %{_bindir}/grepjar%{_exeext} %endif -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gcj.info* %if "%{gcc_version}" >= "3.3" @@ -34,8 +34,8 @@ This is the files for gcc/java (gcj) that are shared by all targets. %if "%{gcc_version}" < "4.0" %if "%{gcc_version}" >= "3.3" -%dir %{_mandir} -%dir %{_mandir}/man1 +%sysdir %{_mandir} +%sysdir %{_mandir}/man1 %{_mandir}/man1/gcjh.1* %{_mandir}/man1/jv-scan.1* %{_mandir}/man1/jcf-dump.1* diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add index 4c03bb05dc..2e941b672b 100644 --- a/contrib/crossrpms/gcc/base-gfortran.add +++ b/contrib/crossrpms/gcc/base-gfortran.add @@ -18,7 +18,7 @@ This is the files for gcc/gfortran that are shared by all targets. %files -n @rpmprefix@rtems@osversion@-base-gfortran %defattr(-,root,root) -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gfortran.info*.gz diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add index 2c75d1261b..1545c01454 100644 --- a/contrib/crossrpms/gcc/base-gnat.add +++ b/contrib/crossrpms/gcc/base-gnat.add @@ -18,10 +18,10 @@ This is the gcc/gnat tools for the gcc/gnat compiler %files -n @rpmprefix@rtems@osversion@-base-gnat %defattr(-,root,root) -%dir %{_bindir} +%sysdir %{_bindir} %{_bindir}/vxaddr2line%{_exeext} -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gnat* diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add index 4ee8a1799a..0a0997a68e 100644 --- a/contrib/crossrpms/gcc/base-newlib.add +++ b/contrib/crossrpms/gcc/base-newlib.add @@ -19,7 +19,7 @@ newlib files that are shared by all targets. %files -n @rpmprefix@rtems@osversion@-base-newlib %defattr(-,root,root) -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/libc.info* %{_infodir}/libm.info* diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add index 5255172d53..eff3375133 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -14,19 +14,15 @@ GNU cc compiler for @tool_target@. %files -n @rpmprefix@@tool_target@-gcc -f build/files.gcc %defattr(-,root,root) -%if "%{_prefix}" != "/usr" -%dir %{_mandir} -%dir %{_mandir}/man1 -%endif +%sysdir %{_mandir} +%sysdir %{_mandir}/man1 %{_mandir}/man1/@tool_target@-gcc.1* %if "%{gcc_version}" >= "3.4" %{_mandir}/man1/@tool_target@-cpp.1* %{_mandir}/man1/@tool_target@-gcov.1* %endif -%if "%{_prefix}" != "/usr" -%dir %{_bindir} -%endif +%sysdir %{_bindir} %{_bindir}/@tool_target@-cpp%{_exeext} %{_bindir}/@tool_target@-gcc%{_exeext} %if "%{gcc_version}" >= "3.3" diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add index daa53e4bfa..6d5f3354d0 100644 --- a/contrib/crossrpms/gcc/target-newlib.add +++ b/contrib/crossrpms/gcc/target-newlib.add @@ -14,9 +14,7 @@ Newlib C Library for @tool_target@. %files -n @rpmprefix@@tool_target@-newlib -f build/files.newlib %defattr(-,root,root) -%if "%{_prefix}" != "/usr" -%dir %{_prefix} -%endif +%sysdir %{_prefix} %dir %{_prefix}/@tool_target@ %{_prefix}/@tool_target@/include diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add index 79bffb16d9..91f3772d12 100644 --- a/contrib/crossrpms/gdb/base-gdb.add +++ b/contrib/crossrpms/gdb/base-gdb.add @@ -44,7 +44,7 @@ fi %files -n @rpmprefix@rtems@osversion@-base-gdb %defattr(-,root,root) -%dir %{_infodir} +%sysdir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gdb.info* diff --git a/contrib/crossrpms/gdb/target-gdb.add b/contrib/crossrpms/gdb/target-gdb.add index edefd7ad5b..8db11997b5 100644 --- a/contrib/crossrpms/gdb/target-gdb.add +++ b/contrib/crossrpms/gdb/target-gdb.add @@ -12,14 +12,10 @@ GNU gdb targetting @tool_target@. %files -n @rpmprefix@@tool_target@-gdb %defattr(-,root,root) -%if "%{_prefix}" != "/usr" -%dir %{_mandir} -%dir %{_mandir}/man1 -%endif +%sysdir %{_mandir} +%sysdir %{_mandir}/man1 %{_mandir}/man1/@tool_target@-*.1* -%if "%{_prefix}" != "/usr" -%dir %{_bindir} -%endif +%sysdir %{_bindir} %{_bindir}/@tool_target@-* -- cgit v1.2.3