From a49d5f512c96195298bd0a557d76c4d57cabc4a7 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Wed, 15 Mar 2006 20:19:05 +0000
Subject: [PATCH] Konfigurations-Template.

---
 Makefile                |  7 -------
 ethercat.conf.tmpl      | 13 +++++++++++++
 mini/Makefile           |  8 +++++---
 mini/ethercat.conf.tmpl | 13 +++++++++++++
 rt/Makefile             | 12 +++++++-----
 rt/ethercat.conf.tmpl   | 13 +++++++++++++
 6 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 ethercat.conf.tmpl
 create mode 100644 mini/ethercat.conf.tmpl
 create mode 100644 rt/ethercat.conf.tmpl

diff --git a/Makefile b/Makefile
index 669f1e65..f82ad98f 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,6 @@ modules:
 clean:
 	$(MAKE) -C $(KERNELDIR) M=`pwd` clean
 
-config conf $(CONFIG_FILE):
-	@echo "# EtherCAT Konfigurationsdatei Kernel 2.6" > $(CONFIG_FILE)
-	@echo >> $(CONFIG_FILE)
-	@echo "KERNELDIR = /usr/src/linux" >> $(CONFIG_FILE)
-	@echo >> $(CONFIG_FILE)
-	@echo "$(CONFIG_FILE) erstellt."
-
 #------------------------------------------------------------------------------
 
 endif
diff --git a/ethercat.conf.tmpl b/ethercat.conf.tmpl
new file mode 100644
index 00000000..a95d6ed5
--- /dev/null
+++ b/ethercat.conf.tmpl
@@ -0,0 +1,13 @@
+#------------------------------------------------------------------------------
+#
+#  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 --git a/mini/Makefile b/mini/Makefile
index aeaa1867..73ab565c 100644
--- a/mini/Makefile
+++ b/mini/Makefile
@@ -11,7 +11,8 @@
 ifneq ($(KERNELRELEASE),)
 
 #----------------------------------------------------------------
-# Kbuild-Abschnitt
+#  Kbuild-Abschnitt
+#----------------------------------------------------------------
 
 obj-m := ec_mini.o
 
@@ -22,12 +23,13 @@ ec_mini-objs := mini.o
 else
 
 #----------------------------------------------------------------
-# Default-Abschnitt
+#  Default-Abschnitt
+#----------------------------------------------------------------
 
 ifneq ($(wildcard ethercat.conf),)
 include ethercat.conf
 else
-KERNELDIR = /lib/modules/`uname -r`/build
+KERNELDIR = /usr/src/linux
 endif
 
 modules:
diff --git a/mini/ethercat.conf.tmpl b/mini/ethercat.conf.tmpl
new file mode 100644
index 00000000..a95d6ed5
--- /dev/null
+++ b/mini/ethercat.conf.tmpl
@@ -0,0 +1,13 @@
+#------------------------------------------------------------------------------
+#
+#  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 --git a/rt/Makefile b/rt/Makefile
index 3e98ba36..0728935b 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -1,15 +1,16 @@
 #------------------------------------------------------------------------------
 #
-# Makefile Echtzeitmodule
+#  Makefile Echtzeitmodule
 #
-# $Id$
+#  $Id$
 #
 #------------------------------------------------------------------------------
 
 ifneq ($(KERNELRELEASE),)
 
 #------------------------------------------------------------------------------
-# Kbuild-Abschnitt
+#  Kbuild-Abschnitt
+#------------------------------------------------------------------------------
 
 obj-m := msr_modul.o
 
@@ -37,12 +38,13 @@ EXTRA_CFLAGS := -I$(src)/rt_lib/msr-include -D_SIMULATION \
 else
 
 #------------------------------------------------------------------------------
-# Default-Abschnitt
+#  Default-Abschnitt
+#------------------------------------------------------------------------------
 
 ifneq ($(wildcard ethercat.conf),)
 include ethercat.conf
 else
-KERNELDIR = /lib/modules/`uname -r`/build
+KERNELDIR = /usr/src/linux
 endif
 
 modules:
diff --git a/rt/ethercat.conf.tmpl b/rt/ethercat.conf.tmpl
new file mode 100644
index 00000000..a95d6ed5
--- /dev/null
+++ b/rt/ethercat.conf.tmpl
@@ -0,0 +1,13 @@
+#------------------------------------------------------------------------------
+#
+#  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
+