# HG changeset patch # User Florian Pose # Date 1148896458 0 # Node ID 9d7453c16adedfe26ae628b6ddb753bf738eb9d8 # Parent 0d4119024f558469672805d40c2916a804f6c578 Consistent example configuration files. diff -r 0d4119024f55 -r 9d7453c16ade examples/mini/Makefile --- a/examples/mini/Makefile Mon May 29 09:08:56 2006 +0000 +++ b/examples/mini/Makefile Mon May 29 09:54:18 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 0d4119024f55 -r 9d7453c16ade examples/mini/ethercat.conf.tmpl --- a/examples/mini/ethercat.conf.tmpl Mon May 29 09:08:56 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 0d4119024f55 -r 9d7453c16ade examples/mini/kernel.conf.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/mini/kernel.conf.tmpl Mon May 29 09:54:18 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 0d4119024f55 -r 9d7453c16ade examples/rtai/Makefile --- a/examples/rtai/Makefile Mon May 29 09:08:56 2006 +0000 +++ b/examples/rtai/Makefile Mon May 29 09:54:18 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 0d4119024f55 -r 9d7453c16ade examples/rtai/kernel.conf.tmpl --- a/examples/rtai/kernel.conf.tmpl Mon May 29 09:08:56 2006 +0000 +++ b/examples/rtai/kernel.conf.tmpl Mon May 29 09:54:18 2006 +0000 @@ -9,5 +9,4 @@ # #------------------------------------------------------------------------------ -KERNELDIR = /usr/src/linux - +KERNELDIR = /lib/modules/`uname -r`/build