Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Consistent example configuration files. stable-1.0
authorFlorian Pose <fp@igh-essen.com>
Mon, 29 May 2006 09:54:18 +0000
branchstable-1.0
changeset 1620 9d7453c16ade
parent 1619 0d4119024f55
child 1621 4bbe090553f7
Consistent example configuration files.
examples/mini/Makefile file | annotate | diff | comparison | revisions
examples/mini/ethercat.conf.tmpl file | annotate | diff | comparison | revisions
examples/mini/kernel.conf.tmpl file | annotate | diff | comparison | revisions
examples/rtai/Makefile file | annotate | diff | comparison | revisions
examples/rtai/kernel.conf.tmpl file | annotate | diff | comparison | revisions 
--- 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:
--- 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
-
--- /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
--- 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:
--- 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
etherlabmaster