Changeset d8f159c in rtems


Ignore:
Timestamp:
Feb 22, 2005, 5:50:30 PM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
233186a
Parents:
8d1928f
Message:

2005-02-22 Ralf Corsepius <ralf.corsepius@…>

  • aclocal/rtems-top.m4: Rework rtems_updir handling to work around ash cd'ing to '/' for 'cd .'.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r8d1928f rd8f159c  
     12005-02-22      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * aclocal/rtems-top.m4: Rework rtems_updir handling to work around
     4        ash cd'ing to '/' for 'cd .//'.
     5
    162005-02-21      Ralf Corsepius <ralf.corsepius@rtems.org>
    27
  • cpukit/aclocal/rtems-top.m4

    r8d1928f rd8f159c  
    2121
    2222# HACK: The sed pattern below strips of "../", corresponding to "cpukit/"
    23 rtems_updir="/"m4_if([$2],[],[`echo "$1/" | sed 's,^\.\.\/,,'`],[$2/])
     23rtems_updir=m4_if([$2],[],[`echo "$1/" | sed 's,^\.\.\/,,'`],[$2/])
    2424
    2525AS_IF([test -n "$with_multisubdir"],
     
    4848   sav2dir=`pwd` && cd "$sav0dir"
    4949   mydir=`echo "$sav1dir" | sed "s,^$sav2dir${MULTISUBDIR}/,,"`
    50    PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'${mydir}/${with_project_root}
     50   PROJECT_ROOT='$(top_builddir)'/${rtems_updir}'../$(MULTIBUILDTOP)'${mydir}/${with_project_root}
    5151   ;;
    5252esac],[
     
    5555## '.' for non-multilib
    5656AS_IF([test "$enable_multilib" = "yes"],[
    57   PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'],[
    58   PROJECT_ROOT='$(top_builddir)'${rtems_updir}])
     57  PROJECT_ROOT='$(top_builddir)'/${rtems_updir}'../$(MULTIBUILDTOP)'],[
     58  PROJECT_ROOT='$(top_builddir)'/${rtems_updir}])
    5959])
    6060
Note: See TracChangeset for help on using the changeset viewer.