diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-11-02 15:44:04 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-11-02 15:44:04 +0000 |
commit | 2e0fd4273d942d48194c27530a67cd5323c80812 (patch) | |
tree | 076d11c8567fc9d138dbfc50e8c6d1c20e74252c /aclocal/rtems-top.m4 | |
parent | 2000-11-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-2e0fd4273d942d48194c27530a67cd5323c80812.tar.bz2 |
2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/*: Replace with contents of macros/*.m4
* macros/: Remove.
* aclocal/ar-s.m4 aclocal/tool-prefix.m4: Remove.
* Makefile.am: Reflect changes to aclocal/ and macros/.
Diffstat (limited to 'aclocal/rtems-top.m4')
-rw-r--r-- | aclocal/rtems-top.m4 | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4 index fa990e9105..fa79019df7 100644 --- a/aclocal/rtems-top.m4 +++ b/aclocal/rtems-top.m4 @@ -15,17 +15,37 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl ENDIF=endif AC_SUBST(ENDIF) -## HACK to destinguish between using GNU and RTEMS canonicalization -AM_CONDITIONAL(RTEMS_CANONICALIZATION,test x=x) - +# with_target_subdir AC_ARG_WITH(target-subdir, [ --with-target-subdir=DIR], -TARGET_SUBDIR="$withval", -TARGET_SUBDIR=".") +with_target_subdir="$withval", +with_target_subdir=".") RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) +if test "$with_target_subdir" = "." ; then +# Native +PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)' +else +# Cross +changequote(, )dnl +dots=`echo $with_target_subdir|\ +sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` +changequote([, ])dnl +PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)' +fi +AC_SUBST(PROJECT_TOPdir) + +if test "$with_target_subdir" = "." ; then +# Native +PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)'; +else +# Cross +PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)' +fi +AC_SUBST(PROJECT_ROOT) + dnl Determine RTEMS Version string from the VERSION file dnl Hopefully, Joel never changes its format ;- AC_MSG_CHECKING([for RTEMS Version]) |