diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-03-17 13:14:52 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-03-17 13:14:52 +0000 |
| commit | 900ae6fd27e72e99633d9a6cf6dc24c5905e3444 (patch) | |
| tree | 4c4285df749b0223e576e8187084e0f1e7ccb196 /contrib | |
| parent | Use %sysdir instead of %if %_prefix ==|!= /usr (diff) | |
| download | rtems-900ae6fd27e72e99633d9a6cf6dc24c5905e3444.tar.bz2 | |
Apply @sysdirpattern@
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/configure.ac | 7 | ||||
| -rw-r--r-- | contrib/crossrpms/mkspec.am | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/contrib/crossrpms/configure.ac b/contrib/crossrpms/configure.ac index 7948753dac..d14561b16f 100644 --- a/contrib/crossrpms/configure.ac +++ b/contrib/crossrpms/configure.ac @@ -3,7 +3,7 @@ m4_define([RTEMS_API],[4.7]) AC_PREREQ(2.59) -AC_INIT([crossrpms],[0.20060315.3],[rtems-bugs@rtems.com]) +AC_INIT([crossrpms],[0.20060317.0],[rtems-bugs@rtems.com]) AC_CONFIG_SRCDIR([binutils/binutils.add]) AC_CONFIG_AUX_DIR(.) @@ -17,21 +17,26 @@ AM_INIT_AUTOMAKE([1.9]) case "$prefix" in /usr) build_infos=0 + sysdirpattern="/%sysdir/d" rpmprefix= ;; /usr/local) build_infos=0 + sysdirpattern="/%sysdir/d" rpmprefix="local-" ;; /opt/rtems) build_infos=1 + sysdirpattern="s/^%sysdir/^%dir/g" rpmprefix="rtems-" ;; NONE|${ac_default_prefix}) # Default prefix build_infos=1 + sysdirpattern="s/^%sysdir/^%dir/g" rpmprefix="[rtems-]RTEMS_API[-]" ;; esac +AC_SUBST(sysdirpattern) AC_ARG_ENABLE([rpmprefix], [ --enable-rpmprefix=<rpmprefix> prefix rpms],[ diff --git a/contrib/crossrpms/mkspec.am b/contrib/crossrpms/mkspec.am index 16db91c1d5..9c2441922d 100644 --- a/contrib/crossrpms/mkspec.am +++ b/contrib/crossrpms/mkspec.am @@ -6,4 +6,5 @@ MKSPEC = sed \ -e "/^%package -n [@]rpmprefix[@][@]tool_target[@]-gcc/d" \ -e "s/-n [@]rpmprefix[@][@]tool_target[@]-gcc//" \ -e "s,[@]build_infos[@],$(build_infos),g" \ + -e "@sysdirpattern@" \ -e "/[@]PATCH/d" |