From 65ea3cc37ea933ac9d3586ea3e9cf48248a20ef8 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 3 Nov 2006 14:18:05 +0000
Subject: [PATCH] Improved installation, added quick modules_install target.
---
Makefile.am | 4 ++++
configure.ac | 27 +++++++++++++++++++++++----
devices/Makefile.am | 8 ++++----
examples/mini/Makefile.am | 8 ++++----
examples/msr/Makefile.am | 8 ++++----
examples/rtai/Makefile.am | 8 ++++----
master/Makefile.am | 8 ++++----
7 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 08bbcb13..845ccfd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,10 @@ EXTRA_DIST = \
globals.h \
LICENSE
+modules_install:
+ $(MAKE) -C master modules_install
+ $(MAKE) -C devices modules_install
+
mydist:
@SVNREV=`svnversion $(srcdir)` && \
$(MAKE) dist-bzip2 \
diff --git a/configure.ac b/configure.ac
index a8f44673..b91f4fe8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AC_ARG_WITH([linux-dir],
modulesdir=/lib/modules/${version}
if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then
echo
- AC_MSG_ERROR([Invalid modules directory ${modulesdir}])
+ AC_MSG_ERROR([Failed to find Linux sources. Use --with-linux-dir!])
fi
sourcedir=`cd ${modulesdir}/build && pwd -P`
]
@@ -45,12 +45,31 @@ AC_ARG_WITH([linux-dir],
AC_MSG_CHECKING([for Linux kernel sources])
if test \! -r ${sourcedir}/.config; then
- echo
- AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir])
+ echo
+ AC_MSG_ERROR([No configured Linux kernel sources in $sourcedir])
fi
+# Try to get kernel release string
+if test -r ${sourcedir}/.kernelrelease; then
+ kernelrelease=`cat $sourcedir/.kernelrelease`
+elif test -r ${sourcedir}/include/linux/version.h; then
+ hdr=$sourcedir/include/linux/version.h
+ kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"`
+fi
+
+if test -z "$kernelrelease"; then
+ echo
+ AC_MSG_ERROR([Failed to extract Linux kernel version!])
+fi
+
+# Extract three numbers from kernel release string
+linuxversion=`echo $kernelrelease | grep -oE [[0-9]]+\.[[0-9]]+\.[[0-9]]+`
+
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir])
-AC_MSG_RESULT($LINUX_SOURCE_DIR)
+AC_SUBST(LINUX_KERNEL_RELEASE,[$kernelrelease])
+AC_SUBST(LINUX_KERNEL_VERSION,[$linuxversion])
+AC_SUBST(LINUX_MOD_PATH,[/lib/modules/$kernelrelease/ethercat])
+AC_MSG_RESULT([$LINUX_SOURCE_DIR (Kernel $LINUX_KERNEL_RELEASE)])
#------------------------------------------------------------------------------
# Debug interface
diff --git a/devices/Makefile.am b/devices/Makefile.am
index ecf7c497..23092016 100644
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@@ -45,9 +45,9 @@ all-local:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
-install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
- INSTALL_MOD_PATH="$(DESTDIR)" \
- INSTALL_MOD_DIR="ethercat" modules_install
+install-data-local: modules_install
+
+modules_install:
+ cp $(srcdir)/ec_8139too.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
diff --git a/examples/mini/Makefile.am b/examples/mini/Makefile.am
index 00c4a21d..3a6cec88 100644
--- a/examples/mini/Makefile.am
+++ b/examples/mini/Makefile.am
@@ -43,9 +43,9 @@ all:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
-install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
- INSTALL_MOD_PATH="$(DESTDIR)" \
- INSTALL_MOD_DIR="ethercat" modules_install
+install-data-local: modules_install
+
+modules_install:
+ cp $(srcdir)/ec_mini.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
diff --git a/examples/msr/Makefile.am b/examples/msr/Makefile.am
index 2e908a5d..2364dede 100644
--- a/examples/msr/Makefile.am
+++ b/examples/msr/Makefile.am
@@ -44,9 +44,9 @@ all:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
-install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
- INSTALL_MOD_PATH="$(DESTDIR)" \
- INSTALL_MOD_DIR="ethercat" modules_install
+install-data-local: modules_install
+
+modules_install:
+ cp $(srcdir)/ec_msr_sample.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
diff --git a/examples/rtai/Makefile.am b/examples/rtai/Makefile.am
index 93abbea1..6eb160e3 100644
--- a/examples/rtai/Makefile.am
+++ b/examples/rtai/Makefile.am
@@ -43,9 +43,9 @@ all:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
-install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
- INSTALL_MOD_PATH="$(DESTDIR)" \
- INSTALL_MOD_DIR="ethercat" modules_install
+install-data-local: modules_install
+
+modules_install:
+ cp $(srcdir)/ec_rtai_sample.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
diff --git a/master/Makefile.am b/master/Makefile.am
index ade86b55..b108a547 100644
--- a/master/Makefile.am
+++ b/master/Makefile.am
@@ -58,9 +58,9 @@ all-local:
clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
-install-data-local:
- $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" \
- INSTALL_MOD_PATH="$(DESTDIR)" \
- INSTALL_MOD_DIR="ethercat" modules_install
+install-data-local: modules_install
+
+modules_install:
+ cp $(srcdir)/ec_master.ko $(DESTDIR)$(LINUX_MOD_PATH)
#------------------------------------------------------------------------------
--
GitLab