diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | aclocal/rtems-top.m4 | 7 |
3 files changed, 9 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> + + * aclocal/rtems-top.m4: Remove ENDIF. + Remove with_target_subdir defaulting to '.'. + * acinclude.m4: Add --includedir to sub_configure_args. + 2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: DIST_SUBDIRS = $(SUBDIRS). diff --git a/acinclude.m4 b/acinclude.m4 index 1e93935c2e..37c76a0527 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -204,7 +204,9 @@ if test "$no_recursion" != yes; then case "$$1_subdir" in "." ) ;; * ) - ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir' '--exec-prefix=${prefix}/$$1_subdir'" + ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir'" + ac_sub_configure_args="$ac_sub_configure_args '--exec-prefix=${prefix}/$$1_subdir'" + ac_sub_configure_args="$ac_sub_configure_args '--includedir=${prefix}/$$1_subdir/include'" ;; esac diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4 index e993a92ddb..9e2ea9c80f 100644 --- a/aclocal/rtems-top.m4 +++ b/aclocal/rtems-top.m4 @@ -16,16 +16,9 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) -## HACK to allow gnu-make conditionals in automake-Makefiles. -ENDIF=endif -AC_SUBST(ENDIF) - RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) -## with_target_subdirs is handled implicitly by autoconf -test -n "$with_target_subdir" || with_target_subdir="." - dots=`echo $with_target_subdir|\ sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'` PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)' |