Explorar el Código

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

Stéphane Raimbault hace 17 años
padre
commit
7811cc83a1
Se han modificado 3 ficheros con 26 adiciones y 25 borrados
  1. 0 24
      INSTALL
  2. 25 0
      README
  3. 1 1
      autogen.sh

+ 0 - 24
INSTALL

@@ -1,24 +0,0 @@
-Basic Installation
-==================
-
-With autotools
---------------
-
-The shell commands are './configure; make; make install'.
-
-
-With Waf
---------
-
-The build system is Waf (http://code.google.com/p/waf), the shell commandes are
-$ ./waf configure
-$ ./waf build
-$ sudo ./waf install
-
-or 'waf' if you use a global Waf script.
-
-The sources are built in the 'build' directory at the root of the
-project source files.
-
-
-WARNING, don't use the two build systems at the same time.

+ 25 - 0
README

@@ -1,6 +1,9 @@
+==================
 A groovy libmodbus
 ==================
 
+Presentation
+============
 https://launchpad.net/libmodbus
 http://copyleft.free.fr/wordpress/index.php/libmodbus/
 
@@ -11,3 +14,25 @@ Ethernet connection.
 The functions included in the library have been derived from the
 Modicon Modbus Protocol Reference Guide which can be obtained from
 Schneider at www.schneiderautomation.com.
+
+Installation
+============
+
+WARNING, don't use the two build systems at the same time.
+
+With autotools
+--------------
+The shell commands are './configure; make; make install'.
+
+With Waf
+--------
+The build system is Waf (http://code.google.com/p/waf), the shell commandes are:
+  $ ./waf configure
+  $ ./waf build
+  $ sudo ./waf install
+
+or 'waf' if you use a global Waf script.
+
+The sources are built in the 'build' directory at the root of the
+project source files.
+

+ 1 - 1
autogen.sh

@@ -22,7 +22,7 @@ find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
 	-o -name Makefile.in \) -print0 | xargs -0 rm -f
 
 echo Running autoreconf...
-autoreconf -v --install
+autoreconf -v --force --install
 
 # For the Debian package build
 test -d debian && {