Commit 7811cc83a1d6ef2a632b9d58f4515dd830d2370b

Authored by Stéphane Raimbault
1 parent 680e90f4

Partial revert of changeset 76 to avoid to use the INSTALL file.

- concat the content of INSTALL at the end of README
- re-add the --force option to autogen.sh
Showing 3 changed files with 26 additions and 25 deletions
INSTALL deleted
1 -Basic Installation  
2 -==================  
3 -  
4 -With autotools  
5 ---------------  
6 -  
7 -The shell commands are './configure; make; make install'.  
8 -  
9 -  
10 -With Waf  
11 ---------  
12 -  
13 -The build system is Waf (http://code.google.com/p/waf), the shell commandes are  
14 -$ ./waf configure  
15 -$ ./waf build  
16 -$ sudo ./waf install  
17 -  
18 -or 'waf' if you use a global Waf script.  
19 -  
20 -The sources are built in the 'build' directory at the root of the  
21 -project source files.  
22 -  
23 -  
24 -WARNING, don't use the two build systems at the same time.  
  1 +==================
1 A groovy libmodbus 2 A groovy libmodbus
2 ================== 3 ==================
3 4
  5 +Presentation
  6 +============
4 https://launchpad.net/libmodbus 7 https://launchpad.net/libmodbus
5 http://copyleft.free.fr/wordpress/index.php/libmodbus/ 8 http://copyleft.free.fr/wordpress/index.php/libmodbus/
6 9
@@ -11,3 +14,25 @@ Ethernet connection. @@ -11,3 +14,25 @@ Ethernet connection.
11 The functions included in the library have been derived from the 14 The functions included in the library have been derived from the
12 Modicon Modbus Protocol Reference Guide which can be obtained from 15 Modicon Modbus Protocol Reference Guide which can be obtained from
13 Schneider at www.schneiderautomation.com. 16 Schneider at www.schneiderautomation.com.
  17 +
  18 +Installation
  19 +============
  20 +
  21 +WARNING, don't use the two build systems at the same time.
  22 +
  23 +With autotools
  24 +--------------
  25 +The shell commands are './configure; make; make install'.
  26 +
  27 +With Waf
  28 +--------
  29 +The build system is Waf (http://code.google.com/p/waf), the shell commandes are:
  30 + $ ./waf configure
  31 + $ ./waf build
  32 + $ sudo ./waf install
  33 +
  34 +or 'waf' if you use a global Waf script.
  35 +
  36 +The sources are built in the 'build' directory at the root of the
  37 +project source files.
  38 +
autogen.sh
@@ -22,7 +22,7 @@ find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \ @@ -22,7 +22,7 @@ find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
22 -o -name Makefile.in \) -print0 | xargs -0 rm -f 22 -o -name Makefile.in \) -print0 | xargs -0 rm -f
23 23
24 echo Running autoreconf... 24 echo Running autoreconf...
25 -autoreconf -v --install 25 +autoreconf -v --force --install
26 26
27 # For the Debian package build 27 # For the Debian package build
28 test -d debian && { 28 test -d debian && {