Hi!
Last week I try to build rtai with nonstandart scheme, which use
--with-linux-dir=dir and remove it after building. But rtai-config gets
broken link after. Next patch resolve it for vesuvio-cvs branch:
if CONFIG_RTAI_LINUXDIR defined rtai-config using it, else
"--with-linux-dir=dir".
--
Evgeny Sinelnikov
diff -Nur vesuvio.orig/configure.in vesuvio/configure.in
--- vesuvio.orig/configure.in 2004-08-26 00:13:45 +0400
+++ vesuvio/configure.in 2004-09-04 04:26:52 +0400
@@ -171,7 +171,14 @@
[ --with-linux-dir=<linux-dir> RTAI-enabled Linux kernel tree],
[
case "$withval" in
- "" | y | ye | yes | n | no)
+ "" )
+ if test x${CONFIG_RTAI_LINUXDIR} = x; then
+ AC_MSG_ERROR([You must supply an argument to --with-linux-dir.])
+ else
+ withval=${CONFIG_RTAI_LINUXDIR}
+ fi
+ ;;
+ y | ye | yes | n | no)
AC_MSG_ERROR([You must supply an argument to --with-linux-dir.])
;;
esac
@@ -203,7 +210,9 @@
RTAI_LINUX_VERSION="$linux_VERSION.$linux_PATCHLEVEL.$linux_SUBLEVEL"
AC_MSG_RESULT([$RTAI_LINUX_DIR (kernel ${RTAI_LINUX_VERSION}${CONFIG_SMP:+-SMP})])
-CONFIG_RTAI_LINUXDIR=$RTAI_LINUX_DIR
+if test x${CONFIG_RTAI_LINUXDIR} = x; then
+ CONFIG_RTAI_LINUXDIR=$RTAI_LINUX_DIR
+fi
dnl
dnl Identify the base technology used.
@@ -1567,6 +1576,8 @@
AC_SUBST(RTAI_KBUILD_CMD)
AC_SUBST(RTAI_KBUILD_CLEAN)
+AC_SUBST(CONFIG_RTAI_LINUXDIR)
+
AC_CONFIG_FILES([ \
GNUmakefile \
rtai-core/GNUmakefile \
diff -Nur vesuvio.orig/makefile vesuvio/makefile
--- vesuvio.orig/makefile 2004-06-06 18:13:41 +0400
+++ vesuvio/makefile 2004-09-04 04:23:15 +0400
@@ -65,6 +65,7 @@
--build=$(build_alias) \
--host=$(host_alias) \
--with-kconfig-file=$< \
+ --with-linux-dir=$(RTAI_LINUX_DIR) \
--prefix=$$CONFIG_RTAI_INSTALLDIR \
$$confopts ; \
if test $$? = 0; then \
diff -Nur vesuvio.orig/rtai-core/scripts/rtai-config.in vesuvio/rtai-core/scripts/rtai-config.in
--- vesuvio.orig/rtai-core/scripts/rtai-config.in 2004-06-06 18:14:45 +0400
+++ vesuvio/rtai-core/scripts/rtai-config.in 2004-09-04 04:17:58 +0400
@@ -15,7 +15,7 @@
RTAI_TARGET_ARCH="@RTAI_TARGET_ARCH@"
RTAI_TARGET_SUBARCH="@RTAI_TARGET_SUBARCH@"
RTAI_CONFIG="${staging}${pkgdatadir}/config-rtai-${RTAI_VERSION}"
-RTAI_LINUX_DIR="@RTAI_LINUX_DIR@"
+RTAI_LINUX_DIR="@CONFIG_RTAI_LINUXDIR@"
RTAI_LINUX_VERSION="@RTAI_LINUX_VERSION@"
RTAI_KERNEL_CFLAGS="-I. @RTAI_COMPAT_CPPFLAGS@ -I${staging}${includedir} @RTAI_KMOD_APP_CFLAGS@ @RTAI_FP_CFLAGS@"
RTAI_KERNEL_CXXFLAGS="-I. @RTAI_COMPAT_CPPFLAGS@ -I${staging}${includedir} @RTAI_KMOD_APP_CXXFLAGS@ @RTAI_FP_CFLAGS@"
