# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1148905037 0
# Node ID fb965f033bb379c9c4cc934368996675ccfd50de
# Parent  76cba93ba122b54957a6d8600c1cff8685488e29
MERGE branches/srable-1.0 -r426:427 -> trunk (config files)

diff -r 76cba93ba122 -r fb965f033bb3 examples/mini/Makefile
--- a/examples/mini/Makefile	Mon May 29 07:48:33 2006 +0000
+++ b/examples/mini/Makefile	Mon May 29 12:17:17 2006 +0000
@@ -53,10 +53,10 @@
 #  default section
 #----------------------------------------------------------------
 
-ifneq ($(wildcard ethercat.conf),)
-include ethercat.conf
+ifneq ($(wildcard kernel.conf),)
+include kernel.conf
 else
-KERNELDIR = /usr/src/linux
+KERNELDIR := /lib/modules/`uname -r`/build
 endif
 
 modules:
diff -r 76cba93ba122 -r fb965f033bb3 examples/mini/ethercat.conf.tmpl
--- a/examples/mini/ethercat.conf.tmpl	Mon May 29 07:48:33 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#------------------------------------------------------------------------------
-#
-#  EtherCAT Konfigurationsdatei Kernel 2.6
-#
-#  $Id$
-#
-#  This file is a versioned template configuration. Copy it to "ethercat.conf"
-#  (which is ignored by Subversion) and adjust it to your needs.
-#
-#------------------------------------------------------------------------------
-
-KERNELDIR = /usr/src/linux
-
diff -r 76cba93ba122 -r fb965f033bb3 examples/mini/kernel.conf.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/mini/kernel.conf.tmpl	Mon May 29 12:17:17 2006 +0000
@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------
+#
+#  Kernel configuration file for EtherCAT mini sample
+#
+#  $Id$
+#
+#  This file is a versioned template configuration. Copy it to "kernel.conf"
+#  (which is ignored by Subversion) and adjust it to your needs.
+#
+#------------------------------------------------------------------------------
+
+KERNELDIR = /lib/modules/`uname -r`/build
diff -r 76cba93ba122 -r fb965f033bb3 examples/rtai/Makefile
--- a/examples/rtai/Makefile	Mon May 29 07:48:33 2006 +0000
+++ b/examples/rtai/Makefile	Mon May 29 12:17:17 2006 +0000
@@ -58,7 +58,7 @@
 ifneq ($(wildcard kernel.conf),)
 include kernel.conf
 else
-KERNELDIR = /usr/src/linux
+KERNELDIR := /lib/modules/`uname -r`/build
 endif
 
 modules:
diff -r 76cba93ba122 -r fb965f033bb3 examples/rtai/kernel.conf.tmpl
--- a/examples/rtai/kernel.conf.tmpl	Mon May 29 07:48:33 2006 +0000
+++ b/examples/rtai/kernel.conf.tmpl	Mon May 29 12:17:17 2006 +0000
@@ -9,5 +9,4 @@
 #
 #------------------------------------------------------------------------------
 
-KERNELDIR = /usr/src/linux
-
+KERNELDIR = /lib/modules/`uname -r`/build