diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-22 17:50:30 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-22 17:50:30 +0000 |
| commit | d8f159ca67535bd2ae8de4d8b765692724352b48 (patch) | |
| tree | 1d9d5ead533a7b4fe70d60ab581a4d37e195df02 /cpukit/aclocal | |
| parent | 2005-02-21 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-d8f159ca67535bd2ae8de4d8b765692724352b48.tar.bz2 | |
2005-02-22 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/rtems-top.m4: Rework rtems_updir handling to work around
ash cd'ing to '/' for 'cd .//'.
Diffstat (limited to 'cpukit/aclocal')
| -rw-r--r-- | cpukit/aclocal/rtems-top.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4 index 7abeb82ba8..107d3b79d7 100644 --- a/cpukit/aclocal/rtems-top.m4 +++ b/cpukit/aclocal/rtems-top.m4 @@ -20,7 +20,7 @@ AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) AC_SUBST([RTEMS_TOPdir],["$1"]) # HACK: The sed pattern below strips of "../", corresponding to "cpukit/" -rtems_updir="/"m4_if([$2],[],[`echo "$1/" | sed 's,^\.\.\/,,'`],[$2/]) +rtems_updir=m4_if([$2],[],[`echo "$1/" | sed 's,^\.\.\/,,'`],[$2/]) AS_IF([test -n "$with_multisubdir"], [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) @@ -47,15 +47,15 @@ case "${with_project_root}" in sav1dir=`pwd` && cd ../${MULTIBUILDTOP} sav2dir=`pwd` && cd "$sav0dir" mydir=`echo "$sav1dir" | sed "s,^$sav2dir${MULTISUBDIR}/,,"` - PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'${mydir}/${with_project_root} + PROJECT_ROOT='$(top_builddir)'/${rtems_updir}'../$(MULTIBUILDTOP)'${mydir}/${with_project_root} ;; esac],[ ## Defaults: Note: Two different defaults! ## ../ for multilib ## '.' for non-multilib AS_IF([test "$enable_multilib" = "yes"],[ - PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'],[ - PROJECT_ROOT='$(top_builddir)'${rtems_updir}]) + PROJECT_ROOT='$(top_builddir)'/${rtems_updir}'../$(MULTIBUILDTOP)'],[ + PROJECT_ROOT='$(top_builddir)'/${rtems_updir}]) ]) AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"]) |