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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu May 21 16:02:47 2009 +0200

Fix default patch selection with --enable-linux-build

---

 Makefile.in  |    2 +-
 configure    |    2 +-
 configure.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a7e4e1e..e095e1b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,7 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog
+       $(srcdir)/Makefile.in $(top_srcdir)/configure
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
diff --git a/configure b/configure
index 6440c3a..e8a87b8 100755
--- a/configure
+++ b/configure
@@ -12637,7 +12637,7 @@ fi
 
 
   if test x"$ADEOS_PATCH" = x && test x"$linux_base_version" != x ; then
-        ADEOS_PATCH="`( ls 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-ipipe-$linux_version*-{$XENO_TARGET_ARCH,$XENO_LINUX_ARCH}-*|sort
 -r ) 2>/dev/null | head -n1`"
+        ADEOS_PATCH="`( ls 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-ipipe-$linux_base_version*-{$XENO_TARGET_ARCH,$XENO_LINUX_ARCH}-*|sort
 -r ) 2>/dev/null | head -n1`"
   fi
   if test x"$ADEOS_PATCH" = x || test ! -e $ADEOS_PATCH ; then
      { { echo "$as_me:$LINENO: error: Unable to find Adeos patch, please use 
--with-adeos-patch" >&5
diff --git a/configure.in b/configure.in
index 42e7229..df26ff2 100644
--- a/configure.in
+++ b/configure.in
@@ -345,7 +345,7 @@ patch. Default is to infer the patch name from Linux kernel 
version.]),
         [ADEOS_PATCH="`/bin/bash -c \"echo $withval\"`"])
 
   if test x"$ADEOS_PATCH" = x && test x"$linux_base_version" != x ; then
-        ADEOS_PATCH="`( ls 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-ipipe-$linux_version*-{$XENO_TARGET_ARCH,$XENO_LINUX_ARCH}-*|sort
 -r ) 2>/dev/null | head -n1`"
+        ADEOS_PATCH="`( ls 
$srcdir/ksrc/arch/$XENO_TARGET_ARCH/patches/adeos-ipipe-$linux_base_version*-{$XENO_TARGET_ARCH,$XENO_LINUX_ARCH}-*|sort
 -r ) 2>/dev/null | head -n1`"
   fi
   if test x"$ADEOS_PATCH" = x || test ! -e $ADEOS_PATCH ; then
      AC_MSG_ERROR([Unable to find Adeos patch, please use --with-adeos-patch])


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

Reply via email to