Module: xenomai-head
Branch: master
Commit: aec30a2543afa18fa7832deee85e187b0faeb1f0
URL:    
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=aec30a2543afa18fa7832deee85e187b0faeb1f0

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Sun May 15 21:20:41 2011 +0200

xeno-test: fix reference to @XENO_TEST_DIR@

when XENO_TEST_DIR is ${exec_prefix}/bin

---

 configure                            |    3 +--
 configure.in                         |    1 -
 src/testsuite/xeno-test/Makefile.am  |    3 +++
 src/testsuite/xeno-test/Makefile.in  |   10 +++++-----
 src/testsuite/xeno-test/xeno-test.in |    2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index adda32e..1c78a68 100755
--- a/configure
+++ b/configure
@@ -12814,7 +12814,7 @@ base=asm-generic
 ac_config_links="$ac_config_links 
src/include/$base/xenomai:$srcdir/include/$base"
 
 
-ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile 
scripts/xeno-config scripts/xeno src/Makefile src/rtdk/Makefile 
src/skins/Makefile src/skins/common/Makefile src/skins/posix/Makefile 
src/skins/native/Makefile src/skins/vxworks/Makefile src/skins/psos+/Makefile 
src/skins/vrtx/Makefile src/skins/rtdm/Makefile src/skins/uitron/Makefile 
src/drvlib/Makefile src/drvlib/analogy/Makefile src/include/Makefile 
src/testsuite/Makefile src/testsuite/latency/Makefile 
src/testsuite/cyclic/Makefile src/testsuite/switchtest/Makefile 
src/testsuite/irqbench/Makefile src/testsuite/clocktest/Makefile 
src/testsuite/klatency/Makefile src/testsuite/unit/Makefile 
src/testsuite/xeno-test/Makefile src/testsuite/xeno-test/xeno-test 
src/utils/Makefile src/utils/can/Makefile src/utils/analogy/Makefile 
src/utils/ps/Makefile include/Makefile include/asm-generic/Makefile 
include/asm-generic/bits/Makefile include/asm-blackfin/Makefile 
include/asm-blackfin/bits/Makefile include/asm-x86/Makefile 
include/asm-x86/bits/Makefile include/asm-powerpc/Makefile 
include/asm-powerpc/bits/Makefile include/asm-arm/Makefile 
include/asm-arm/bits/Makefile include/asm-nios2/Makefile 
include/asm-nios2/bits/Makefile include/asm-sim/Makefile 
include/asm-sim/bits/Makefile include/native/Makefile include/nucleus/Makefile 
include/posix/Makefile include/posix/sys/Makefile include/psos+/Makefile 
include/rtdm/Makefile include/analogy/Makefile include/uitron/Makefile 
include/vrtx/Makefile include/vxworks/Makefile"
+ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile 
scripts/xeno-config scripts/xeno src/Makefile src/rtdk/Makefile 
src/skins/Makefile src/skins/common/Makefile src/skins/posix/Makefile 
src/skins/native/Makefile src/skins/vxworks/Makefile src/skins/psos+/Makefile 
src/skins/vrtx/Makefile src/skins/rtdm/Makefile src/skins/uitron/Makefile 
src/drvlib/Makefile src/drvlib/analogy/Makefile src/include/Makefile 
src/testsuite/Makefile src/testsuite/latency/Makefile 
src/testsuite/cyclic/Makefile src/testsuite/switchtest/Makefile 
src/testsuite/irqbench/Makefile src/testsuite/clocktest/Makefile 
src/testsuite/klatency/Makefile src/testsuite/unit/Makefile 
src/testsuite/xeno-test/Makefile src/utils/Makefile src/utils/can/Makefile 
src/utils/analogy/Makefile src/utils/ps/Makefile include/Makefile 
include/asm-generic/Makefile include/asm-generic/bits/Makefile 
include/asm-blackfin/Makefile include/asm-blackfin/bits/Makefile 
include/asm-x86/Makefile include/asm-x86/bits/Makefile 
include/asm-powerpc/Makefile include/asm-powerpc/bits/Makefile 
include/asm-arm/Makefile include/asm-arm/bits/Makefile 
include/asm-nios2/Makefile include/asm-nios2/bits/Makefile 
include/asm-sim/Makefile include/asm-sim/bits/Makefile include/native/Makefile 
include/nucleus/Makefile include/posix/Makefile include/posix/sys/Makefile 
include/psos+/Makefile include/rtdm/Makefile include/analogy/Makefile 
include/uitron/Makefile include/vrtx/Makefile include/vxworks/Makefile"
 
 
 if test \! x$XENO_MAYBE_DOCDIR = x ; then
@@ -13931,7 +13931,6 @@ do
     "src/testsuite/klatency/Makefile") CONFIG_FILES="$CONFIG_FILES 
src/testsuite/klatency/Makefile" ;;
     "src/testsuite/unit/Makefile") CONFIG_FILES="$CONFIG_FILES 
src/testsuite/unit/Makefile" ;;
     "src/testsuite/xeno-test/Makefile") CONFIG_FILES="$CONFIG_FILES 
src/testsuite/xeno-test/Makefile" ;;
-    "src/testsuite/xeno-test/xeno-test") CONFIG_FILES="$CONFIG_FILES 
src/testsuite/xeno-test/xeno-test" ;;
     "src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
     "src/utils/can/Makefile") CONFIG_FILES="$CONFIG_FILES 
src/utils/can/Makefile" ;;
     "src/utils/analogy/Makefile") CONFIG_FILES="$CONFIG_FILES 
src/utils/analogy/Makefile" ;;
diff --git a/configure.in b/configure.in
index 6f3053f..08a21b1 100644
--- a/configure.in
+++ b/configure.in
@@ -762,7 +762,6 @@ AC_CONFIG_FILES([ \
        src/testsuite/klatency/Makefile \
        src/testsuite/unit/Makefile \
        src/testsuite/xeno-test/Makefile \
-       src/testsuite/xeno-test/xeno-test \
        src/utils/Makefile \
        src/utils/can/Makefile \
        src/utils/analogy/Makefile \
diff --git a/src/testsuite/xeno-test/Makefile.am 
b/src/testsuite/xeno-test/Makefile.am
index f3e0e5a..1d082de 100644
--- a/src/testsuite/xeno-test/Makefile.am
+++ b/src/testsuite/xeno-test/Makefile.am
@@ -6,4 +6,7 @@ bin_SCRIPTS = xeno-test
 
 xeno_test_run_CPPFLAGS = -DTESTDIR=\"$(testdir)\"
 
+xeno-test: $(srcdir)/xeno-test.in Makefile
+       sed "s,@testdir@,$(testdir)," $< > $@
+
 EXTRA_DIST = $(test_SCRIPTS)
diff --git a/src/testsuite/xeno-test/Makefile.in 
b/src/testsuite/xeno-test/Makefile.in
index c1bf537..97a5dad 100644
--- a/src/testsuite/xeno-test/Makefile.in
+++ b/src/testsuite/xeno-test/Makefile.in
@@ -38,8 +38,7 @@ host_triplet = @host@
 target_triplet = @target@
 test_PROGRAMS = xeno-test-run$(EXEEXT)
 subdir = src/testsuite/xeno-test
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/xeno-test.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -53,7 +52,7 @@ am__configure_deps = $(am__aclocal_m4_deps) 
$(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/include/xeno_config.h
-CONFIG_CLEAN_FILES = xeno-test
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(testdir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(testdir)"
@@ -294,8 +293,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ 
$(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-xeno-test: $(top_builddir)/config.status $(srcdir)/xeno-test.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-testPROGRAMS: $(test_PROGRAMS)
        @$(NORMAL_INSTALL)
        test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
@@ -665,6 +662,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-testPROGRAMS \
        uninstall-testSCRIPTS
 
 
+xeno-test: xeno-test.in Makefile.in
+       sed "s,@testdir@,$(testdir)," $< > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/testsuite/xeno-test/xeno-test.in 
b/src/testsuite/xeno-test/xeno-test.in
index 324a339..a9d1e76 100644
--- a/src/testsuite/xeno-test/xeno-test.in
+++ b/src/testsuite/xeno-test/xeno-test.in
@@ -1,4 +1,4 @@
-#! @XENO_TEST_DIR@/xeno-test-run
+#! @testdir@/xeno-test-run
 
 usage()
 {


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to