diff --git a/Makefile.am b/Makefile.am index 83cdc9ed63d68cea172301cb6fbd9bf779fb6ba9..88e08d73614d201327a389338b56e8258269e1b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 @@ MSR_FILES = \ 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 @@ dist-hook: 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 diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000000000000000000000000000000000000..e4240a087e21da4c6083253bc75a6f281e2f3e54 --- /dev/null +++ b/bootstrap @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x +aclocal -I config +autoheader +automake --add-missing +autoconf diff --git a/configure.ac b/configure.ac index 054009046f213582136509d5fb42797270f51e42..36f8aa5c0d10160859bf68233270726130d6c9ba 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ fi #------------------------------------------------------------------------------ +AC_CONFIG_FILES([ + Makefile + master/Makefile + devices/Makefile + script/Makefile + examples/mini/Makefile + examples/rtai/Makefile + examples/msr/Makefile +]) AC_OUTPUT #------------------------------------------------------------------------------ diff --git a/devices/Makefile.am b/devices/Makefile.am index 0727a2b3e76269bb53f7ce0ee4ff46c5889119ca..dc0279cc41d4c374815c6fba8cddbfe3cf604b0b 100644 --- a/devices/Makefile.am +++ b/devices/Makefile.am @@ -51,6 +51,7 @@ clean-local: install-data-local: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \ + INSTALL_MOD_PATH="$(DESTDIR)" \ INSTALL_MOD_DIR="ethercat" modules_install #------------------------------------------------------------------------------ diff --git a/examples/mini/Makefile.am b/examples/mini/Makefile.am index 9ab355535281b2534c85182f09aae7492a2835a8..f681d1d60f0e2fe2af8c15e355a7685829b04b03 100644 --- a/examples/mini/Makefile.am +++ b/examples/mini/Makefile.am @@ -45,6 +45,7 @@ clean-local: install-data-local: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \ + INSTALL_MOD_PATH="$(DESTDIR)" \ INSTALL_MOD_DIR="ethercat" modules_install #------------------------------------------------------------------------------ diff --git a/examples/msr/Makefile.am b/examples/msr/Makefile.am index 24acdf7492b0709d35cebe51f449c3acca13dd37..793904b491b8910f0985e425d2b203793221372b 100644 --- a/examples/msr/Makefile.am +++ b/examples/msr/Makefile.am @@ -52,6 +52,7 @@ clean-local: install-data-local: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \ + INSTALL_MOD_PATH="$(DESTDIR)" \ INSTALL_MOD_DIR="ethercat" modules_install #------------------------------------------------------------------------------ diff --git a/examples/rtai/Makefile.am b/examples/rtai/Makefile.am index acace65b562d82ff463459dbb729534deef0634d..aa9bd648e0b74c0a9e2d23bcbf0b1e62b39d3da1 100644 --- a/examples/rtai/Makefile.am +++ b/examples/rtai/Makefile.am @@ -47,6 +47,7 @@ clean-local: install-data-local: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \ + INSTALL_MOD_PATH="$(DESTDIR)" \ INSTALL_MOD_DIR="ethercat" modules_install #------------------------------------------------------------------------------ diff --git a/master/Makefile.am b/master/Makefile.am index 52fdde0f2d4c513b1624b56da9506ac5f73bae18..8983f2d2a185032f0c85b4bba553cc558206f4da 100644 --- a/master/Makefile.am +++ b/master/Makefile.am @@ -61,6 +61,7 @@ clean-local: install-data-local: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="$(ABSSRCDIR)" \ + INSTALL_MOD_PATH="$(DESTDIR)" \ INSTALL_MOD_DIR="ethercat" modules_install #------------------------------------------------------------------------------