Module: xenomai-forge
Branch: next
Commit: 47802a49090498e80ee6975e45a3fcd2c5228845
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=47802a49090498e80ee6975e45a3fcd2c5228845

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu Jun 26 17:04:48 2014 +0200

build: fix default demo directory setting

---

 configure    |    3 ++-
 configure.ac |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index b56c40e..475949f 100755
--- a/configure
+++ b/configure
@@ -13982,6 +13982,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XENO_TEST_DIR" >&5
 $as_echo "$XENO_TEST_DIR" >&6; }
 
+demodir='${exec_prefix}/demo'
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking location for demo programs" 
>&5
 $as_echo_n "checking location for demo programs... " >&6; }
 
@@ -13996,7 +13997,7 @@ if test "${with_demodir+set}" = set; then :
        XENO_DEMO_DIR="$withval"
 
 else
-  XENO_DEMO_DIR=$prefix/demo
+  XENO_DEMO_DIR=$demodir
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XENO_DEMO_DIR" >&5
diff --git a/configure.ac b/configure.ac
index 15fef0e..f6a4e44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -682,6 +682,7 @@ AC_ARG_WITH(testdir,
     ], [XENO_TEST_DIR=$bindir])
 AC_MSG_RESULT($XENO_TEST_DIR)
 
+demodir='${exec_prefix}/demo'
 AC_MSG_CHECKING(location for demo programs)
 AC_ARG_WITH(demodir,
     AS_HELP_STRING([--with-demo=<demo-program-dir>],[location for demo 
programs (defaults to $prefix/demo)]),
@@ -692,7 +693,7 @@ AC_ARG_WITH(demodir,
          ;;
        esac
        XENO_DEMO_DIR="$withval"
-    ], [XENO_DEMO_DIR=$prefix/demo])
+    ], [XENO_DEMO_DIR=$demodir])
 AC_MSG_RESULT($XENO_DEMO_DIR)
 
 AC_MSG_CHECKING([for test source generation])


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to