[geos-commits] [SCM] GEOS branch master updated. 4ff201dfd885b00dd3e6cdf38d3a918fbde32a7b

git at osgeo.org git at osgeo.org
Sun Oct 7 09:28:36 PDT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  4ff201dfd885b00dd3e6cdf38d3a918fbde32a7b (commit)
       via  95d0ec97727dc8fc8defafb8977edcba3e58ce2b (commit)
      from  a67b6f8656ede68317d0a42e9b8a9e078281684a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ff201dfd885b00dd3e6cdf38d3a918fbde32a7b
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Oct 7 18:28:23 2018 +0200

    Put building prerequisite in a common section

diff --git a/README.md b/README.md
index a43f331..c48fd69 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,11 @@ More on: https://trac.osgeo.org/geos#BuildandInstall
 
 ## Building, testing, installing
 
-### Unix
+### Prerequisites
 
-#### Prerequisites
+Building GEOS requires a C++11 compiler
 
-geos requires a C++11 compiler
+### Unix
 
 #### Using Autotools:
 

commit 95d0ec97727dc8fc8defafb8977edcba3e58ce2b
Author: Greg Troxel <gdt at lexort.com>
Date:   Sat Oct 6 19:29:57 2018 -0400

    README.md: Clarify installation instructions

diff --git a/README.md b/README.md
index f0032f4..a43f331 100644
--- a/README.md
+++ b/README.md
@@ -17,22 +17,27 @@ More on: https://trac.osgeo.org/geos#BuildandInstall
 
 ### Unix
 
-Using Autotools:
+#### Prerequisites
+
+geos requires a C++11 compiler
+
+#### Using Autotools:
 
     ./autogen.sh  # in ${srcdir}, if obtained from SVN or GIT
-    ${srcdir}/configure # in build dir
+    (mkdir obj && cd obj && ../configure)
 
-Using CMake:
+#### Using CMake:
 
-    cmake ${srcdir} # in build dir
+    (mkdir build && cd build && cmake ..)
 
-Now, all versions:
+#### Either Autotools or CMake
 
     make
     make check
-    make install # as root
-    ldconfig # as root
+    make install # (as root, assuming PREFIX is not writable by the build user)
 
+    On a GNU/Linux system, if installed in a system prefix:
+      ldconfig # as root
 
 ### Microsoft Windows
 

-----------------------------------------------------------------------

Summary of changes:
 README.md | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list