RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* aclocal/rtems-top.m4: Remove ENDIF.
	Remove with_target_subdir defaulting to '.'.
	* acinclude.m4: Add --includedir to sub_configure_args.
This commit is contained in:
Ralf Corsepius
2004-03-31 10:55:15 +00:00
parent a785e63585
commit 3456ce8a46
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -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> 2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: DIST_SUBDIRS = $(SUBDIRS). * Makefile.am: DIST_SUBDIRS = $(SUBDIRS).

4
acinclude.m4
View File

@@ -204,7 +204,9 @@ if test "$no_recursion" != yes; then
case "$$1_subdir" in 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 esac

7
aclocal/rtems-top.m4
View File

@@ -16,16 +16,9 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
## HACK to allow gnu-make conditionals in automake-Makefiles.
ENDIF=endif
AC_SUBST(ENDIF)
RTEMS_TOPdir="$1"; RTEMS_TOPdir="$1";
AC_SUBST(RTEMS_TOPdir) 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|\ dots=`echo $with_target_subdir|\
sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'` sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)' PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'