Added file ./bootstrap; Added $(DESTDIR) to */Makefile.am make alternate root installs possible
--- a/Makefile.am Thu Oct 05 09:38:01 2006 +0000
+++ b/Makefile.am Mon Oct 09 12:59:09 2006 +0000
@@ -35,13 +35,9 @@
#
#------------------------------------------------------------------------------
-SUBDIRS = master/ devices/
-
-initdir = $(sysconfdir)/init.d
-sysdir = $(sysconfdir)/sysconfig
+SUBDIRS = master/ devices/ script/
include_HEADERS = include/ecdb.h include/ecrt.h
-noinst_SCRIPTS = script/lsec.pl script/ethercat.sh script/sysconfig
MINI_FILES = \
examples/mini/Kbuild \
@@ -66,7 +62,7 @@
examples/msr/msrserv.pl \
examples/msr/msr_unload
-EXTRA_DIST = $(noinst_SCRIPTS) documentation/ethercat_doc.pdf \
+EXTRA_DIST = documentation/ethercat_doc.pdf \
$(MINI_FILES) $(RTAI_FILES) $(MSR_FILES)
mydist:
@@ -79,19 +75,7 @@
fi
install-data-local:
- $(mkinstalldirs) $(bindir)
- $(mkinstalldirs) $(initdir)
- $(mkinstalldirs) $(sysdir)
- $(INSTALL_SCRIPT) $(srcdir)/script/lsec.pl $(bindir)/lsec
- $(INSTALL_SCRIPT) $(srcdir)/script/ethercat.sh $(initdir)/ethercat
- $(INSTALL_DATA) $(srcdir)/script/sysconfig $(sysdir)/ethercat
- $(DEPMOD) $(LINUX_KERNEL_VERSION)
-
-uninstall-local:
- rm -rf $(LINUX_MODULES_DIR)/ethercat
- rm $(bindir)/lsec
- rm $(initdir)/ethercat
- rm $(sysdir)/ethercat
+ $(DEPMOD) -b "$(DESTDIR)" $(LINUX_KERNEL_VERSION)
doc:
doxygen Doxyfile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bootstrap Mon Oct 09 12:59:09 2006 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+aclocal -I config
+autoheader
+automake --add-missing
+autoconf
--- a/configure.ac Thu Oct 05 09:38:01 2006 +0000
+++ b/configure.ac Mon Oct 09 12:59:09 2006 +0000
@@ -5,10 +5,6 @@
AC_INIT([ethercat],[1.1],[fp@igh-essen.com])
AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2])
AC_PREFIX_DEFAULT([/opt/etherlab])
-AC_CONFIG_FILES([Makefile master/Makefile devices/Makefile \
- examples/mini/Makefile \
- examples/rtai/Makefile \
- examples/msr/Makefile])
#------------------------------------------------------------------------------
# Linux sources
@@ -53,6 +49,15 @@
#------------------------------------------------------------------------------
+AC_CONFIG_FILES([
+ Makefile
+ master/Makefile
+ devices/Makefile
+ script/Makefile
+ examples/mini/Makefile
+ examples/rtai/Makefile
+ examples/msr/Makefile
+])
AC_OUTPUT
#------------------------------------------------------------------------------
--- a/devices/Makefile.am Thu Oct 05 09:38:01 2006 +0000
+++ b/devices/Makefile.am Mon Oct 09 12:59:09 2006 +0000
@@ -51,6 +51,7 @@
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
#------------------------------------------------------------------------------
--- a/examples/mini/Makefile.am Thu Oct 05 09:38:01 2006 +0000
+++ b/examples/mini/Makefile.am Mon Oct 09 12:59:09 2006 +0000
@@ -45,6 +45,7 @@
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
#------------------------------------------------------------------------------
--- a/examples/msr/Makefile.am Thu Oct 05 09:38:01 2006 +0000
+++ b/examples/msr/Makefile.am Mon Oct 09 12:59:09 2006 +0000
@@ -52,6 +52,7 @@
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
#------------------------------------------------------------------------------
--- a/examples/rtai/Makefile.am Thu Oct 05 09:38:01 2006 +0000
+++ b/examples/rtai/Makefile.am Mon Oct 09 12:59:09 2006 +0000
@@ -47,6 +47,7 @@
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
#------------------------------------------------------------------------------
--- a/master/Makefile.am Thu Oct 05 09:38:01 2006 +0000
+++ b/master/Makefile.am Mon Oct 09 12:59:09 2006 +0000
@@ -61,6 +61,7 @@
install-data-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \
+ INSTALL_MOD_PATH="$(DESTDIR)" \
INSTALL_MOD_DIR="ethercat" modules_install
#------------------------------------------------------------------------------