MERGE branches/srable-1.0 -r426:427 -> trunk (config files)

examples/mini/Makefile

@@ -53,10 +53,10 @@ else
 #  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:

examples/mini/ethercat.conf.tmpl → examples/mini/kernel.conf.tmpl

 #------------------------------------------------------------------------------
 #
-#  EtherCAT Konfigurationsdatei Kernel 2.6
+#  Kernel configuration file for EtherCAT mini sample
 #
 #  $Id$
 #
-#  This file is a versioned template configuration. Copy it to "ethercat.conf"
+#  This file is a versioned template configuration. Copy it to "kernel.conf"
 #  (which is ignored by Subversion) and adjust it to your needs.
 #
 #------------------------------------------------------------------------------
 
-KERNELDIR = /usr/src/linux
-
+KERNELDIR = /lib/modules/`uname -r`/build

examples/rtai/Makefile

@@ -58,7 +58,7 @@ else
 ifneq ($(wildcard kernel.conf),)
 include kernel.conf
 else
-KERNELDIR = /usr/src/linux
+KERNELDIR := /lib/modules/`uname -r`/build
 endif
 
 modules:

examples/rtai/kernel.conf.tmpl

@@ -9,5 +9,4 @@
 #
 #------------------------------------------------------------------------------
 
-KERNELDIR = /usr/src/linux
-
+KERNELDIR = /lib/modules/`uname -r`/build