diff options
Diffstat (limited to '')
-rw-r--r-- | configure | 32 | ||||
-rw-r--r-- | configure.in | 14 |
2 files changed, 23 insertions, 23 deletions
@@ -1434,7 +1434,7 @@ echo "configure:1414: checking for bsps" >&5 # collect makefiles for each bsp for i in $rtems_bsp; do # make sure there is a make/custom file for the bsp - if test ! -r "$srcdir/c/make/custom/${i}.cfg"; then + if test ! -r "$srcdir/make/custom/${i}.cfg"; then { echo "configure: error: no make/custom/${i}.cfg file for BSP $i" 1>&2; exit 1; } fi @@ -1528,7 +1528,7 @@ if [ "${program_prefix}" = "NONE" ] ; then fi fi -RTEMS_ROOT=`cd $srcdir/c; pwd` +RTEMS_ROOT=`cd $srcdir; pwd` PROJECT_ROOT=`pwd;` # If RTEMS macros are enabled, then use them. Otherwise, use inlines. @@ -1723,12 +1723,12 @@ fi -echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/eeprom""... $ac_c" 1>&6 -echo "configure:1728: checking for Makefile.in in c/src/lib/libhwapi/eeprom" >&5 -if test -d $srcdir/c/src/lib/libhwapi/eeprom; then +echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6 +echo "configure:1728: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5 +if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then rtems_av_save_dir=`pwd`; cd $srcdir; - rtems_av_tmp=`find c/src/lib/libhwapi/eeprom -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` + rtems_av_tmp=`find c/src/lib/libhwapi/non_volatile_memory -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` makefiles="$makefiles $rtems_av_tmp"; cd $rtems_av_save_dir; echo "$ac_t""done" 1>&6 @@ -1826,12 +1826,12 @@ fi -echo $ac_n "checking for Makefile.in in c/make""... $ac_c" 1>&6 -echo "configure:1831: checking for Makefile.in in c/make" >&5 -if test -d $srcdir/c/make; then +echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6 +echo "configure:1831: checking for Makefile.in in make" >&5 +if test -d $srcdir/make; then rtems_av_save_dir=`pwd`; cd $srcdir; - rtems_av_tmp=`find c/make -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` + rtems_av_tmp=`find make -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"` makefiles="$makefiles $rtems_av_tmp"; cd $rtems_av_save_dir; echo "$ac_t""done" 1>&6 @@ -2014,9 +2014,9 @@ c/src/tests/support/wrapup/Makefile c/src/tests/tools/Makefile c/src/tests/tools/generic/Makefile $makefiles -c/make/host.cfg -c/make/target.cfg -c/make/Templates/Makefile.inc +make/host.cfg +make/target.cfg +make/Templates/Makefile.inc c/update-tools/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -2160,9 +2160,9 @@ c/src/tests/support/wrapup/Makefile c/src/tests/tools/Makefile c/src/tests/tools/generic/Makefile $makefiles -c/make/host.cfg -c/make/target.cfg -c/make/Templates/Makefile.inc +make/host.cfg +make/target.cfg +make/Templates/Makefile.inc c/update-tools/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF diff --git a/configure.in b/configure.in index 84af661bfc..1b8a4c9ed6 100644 --- a/configure.in +++ b/configure.in @@ -213,7 +213,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then # collect makefiles for each bsp for i in $rtems_bsp; do # make sure there is a make/custom file for the bsp - if test ! -r "$srcdir/c/make/custom/${i}.cfg"; then + if test ! -r "$srcdir/make/custom/${i}.cfg"; then AC_MSG_ERROR([no make/custom/${i}.cfg file for BSP $i]) fi @@ -268,7 +268,7 @@ if [[ "${program_prefix}" = "NONE" ]] ; then fi fi -RTEMS_ROOT=`cd $srcdir/c; pwd` +RTEMS_ROOT=`cd $srcdir; pwd` PROJECT_ROOT=`pwd;` # If RTEMS macros are enabled, then use them. Otherwise, use inlines. @@ -327,7 +327,7 @@ AC_ARG_ENABLE(hwapi, \ RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/analog) RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/discrete) RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/drivers) - RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/eeprom) + RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/non_volatile_memory) RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/serial) RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/support) RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/wrapup) @@ -357,7 +357,7 @@ AC_SUBST(program_prefix) # pick up all the Makefiles in required parts of the tree RTEMS_CHECK_MAKEFILE(c/build-tools) -RTEMS_CHECK_MAKEFILE(c/make) +RTEMS_CHECK_MAKEFILE(make) RTEMS_CHECK_MAKEFILE(c/src/lib/libmisc) RTEMS_CHECK_MAKEFILE(c/src/tests/samples) @@ -393,9 +393,9 @@ c/src/tests/support/wrapup/Makefile c/src/tests/tools/Makefile c/src/tests/tools/generic/Makefile $makefiles -c/make/host.cfg -c/make/target.cfg -c/make/Templates/Makefile.inc +make/host.cfg +make/target.cfg +make/Templates/Makefile.inc c/update-tools/Makefile) echo |