Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-22 01:53:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian Pose
2006-05-29 12:17:17 +00:00
parent b0c8f6d50f
commit 430c24a086
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/mini/Makefile
+3 -3
View File
@@ -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
+3 -4
View File
@@ -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
examples/rtai/Makefile
+1 -1
View File
@@ -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
+1 -2
View File
@@ -9,5 +9,4 @@
#
#------------------------------------------------------------------------------
KERNELDIR = /usr/src/linux
KERNELDIR = /lib/modules/`uname -r`/build