Another attempt to get runtest installed.

4 files changed, 13 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
index d0c96a0192..a1c2545fcd 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
@@ -10,6 +10,6 @@ noinst_SCRIPTS=runtest
 #HACK: install to build-tree
 install-exec-local: $(SCRIPTS)
 	$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
-	$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests
+	$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest
 
 include $(top_srcdir)/../../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in
index 0fcee3b6ba..b111a8fbb1 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in
+++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in
@@ -86,10 +86,11 @@ ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal
 noinst_SCRIPTS = runtest
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  runtest
 SCRIPTS =  $(noinst_SCRIPTS)
 
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
+DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in \
+runtest.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -112,6 +113,8 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
+runtest: $(top_builddir)/config.status runtest.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 tags: TAGS
 TAGS:
 
@@ -235,7 +238,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 #HACK: install to build-tree
 install-exec-local: $(SCRIPTS)
 	$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests
-	$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests
+	$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest
 
 debug-am:
 
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/configure b/c/src/lib/libbsp/sparc/erc32/tools/configure
index de0ec52b6f..c906202174 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/configure
+++ b/c/src/lib/libbsp/sparc/erc32/tools/configure
@@ -1069,7 +1069,8 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile
+runtest" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1171,7 +1172,8 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile
+runtest"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/configure.in b/c/src/lib/libbsp/sparc/erc32/tools/configure.in
index 6db5a96ec5..e83e201612 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/configure.in
+++ b/c/src/lib/libbsp/sparc/erc32/tools/configure.in
@@ -13,4 +13,5 @@ AM_INIT_AUTOMAKE(rtems-lib-libbsp-sparc-erc32-tools,$RTEMS_VERSION,no)
 RTEMS_PATH_KSH
 
 AC_OUTPUT( 
-Makefile)
+Makefile
+runtest)