From ed5a1a23af4a3dd1db6cddad847b140161882b2c Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Mon, 29 May 2006 12:17:17 +0000
Subject: [PATCH] MERGE branches/srable-1.0 -r426:427 -> trunk (config files)
---
examples/mini/Makefile | 6 +++---
examples/mini/{ethercat.conf.tmpl => kernel.conf.tmpl} | 7 +++----
examples/rtai/Makefile | 2 +-
examples/rtai/kernel.conf.tmpl | 3 +--
4 files changed, 8 insertions(+), 10 deletions(-)
rename examples/mini/{ethercat.conf.tmpl => kernel.conf.tmpl} (73%)
diff --git a/examples/mini/Makefile b/examples/mini/Makefile
index 4c1f61bb..41f93e53 100644
--- a/examples/mini/Makefile
+++ b/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:
diff --git a/examples/mini/ethercat.conf.tmpl b/examples/mini/kernel.conf.tmpl
similarity index 73%
rename from examples/mini/ethercat.conf.tmpl
rename to examples/mini/kernel.conf.tmpl
index a95d6ed5..597ab921 100644
--- a/examples/mini/ethercat.conf.tmpl
+++ b/examples/mini/kernel.conf.tmpl
@@ -1,13 +1,12 @@
#------------------------------------------------------------------------------
#
-# 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
diff --git a/examples/rtai/Makefile b/examples/rtai/Makefile
index 30d903c8..adb83ff7 100644
--- a/examples/rtai/Makefile
+++ b/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:
diff --git a/examples/rtai/kernel.conf.tmpl b/examples/rtai/kernel.conf.tmpl
index 88a5cb9e..c03240be 100644
--- a/examples/rtai/kernel.conf.tmpl
+++ b/examples/rtai/kernel.conf.tmpl
@@ -9,5 +9,4 @@
#
#------------------------------------------------------------------------------
-KERNELDIR = /usr/src/linux
-
+KERNELDIR = /lib/modules/`uname -r`/build
--
GitLab