diff options
Diffstat (limited to 'cpukit/aclocal/rtems-top.m4')
| -rw-r--r-- | cpukit/aclocal/rtems-top.m4 | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4 index e3ac18e21f..6d6f6fabc5 100644 --- a/cpukit/aclocal/rtems-top.m4 +++ b/cpukit/aclocal/rtems-top.m4 @@ -11,20 +11,56 @@ AC_DEFUN([RTEMS_TOP], [dnl AC_REQUIRE([RTEMS_VERSIONING]) AC_REQUIRE([AM_SET_LEADING_DOT]) -AC_CONFIG_AUX_DIR([../$1]) +AC_CONFIG_AUX_DIR([$1]) AC_CHECK_PROGS(MAKE, gmake make) AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) -RTEMS_TOPdir="$1"; -AC_SUBST(RTEMS_TOPdir) +AC_SUBST([RTEMS_TOPdir],["$1"]) -## with_target_subdirs is handled implicitly by autoconf -test -n "$with_target_subdir" || with_target_subdir="." +# HACK: The sed pattern below strips of "../", corresponding to "cpukit/" +rtems_updir="/"m4_if([$2],[],[`echo "$1/" | sed s,^\.\.\/,,`],[$2/]) -AC_MSG_CHECKING([for RTEMS Version]) -AC_MSG_RESULT([_RTEMS_VERSION]) +AS_IF([test -n "$with_multisubdir"], + [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) +AC_SUBST(MULTIBUILDTOP) + +AS_IF([test -n "$with_multisubdir"], + [MULTISUBDIR="/$with_multisubdir"]) +AC_SUBST(MULTISUBDIR) + +AC_ARG_WITH([project-root],[ +AS_HELP_STRING(--with-project-root,directory to pre-install files into)],[ +## Make sure to have a terminating '/' +case "${with_project_root}" in +*/) ;; +*) with_project_root="${with_project_root}/" ;; +esac + +case "${with_project_root}" in + [[\\/$]]* | ?:[[\\/]]* ) # absolute directory + PROJECT_ROOT=${with_project_root} + ;; + *) # relative directory + sav0dir=`pwd` && cd ./${rtems_updir} + 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} + ;; +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}]) +]) +AC_SUBST([PROJECT_ROOT]) + +AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"]) +AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"]) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) ])dnl |