Branch 'libkolabxml-0.7' - 2 commits - autogen.sh README

Christian Mollekopf mollekopf at kolabsys.com
Thu Jul 19 12:24:09 CEST 2012


 README     |    2 +-
 autogen.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit de64c8fd00a9bcc58f64b5875de5bcbe519e5a62
Merge: 78c2c1f 6d8eebf
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jul 19 12:23:24 2012 +0200

    Merge branch 'master' into libkolabxml-0.7



commit 6d8eebf6b11435bf32c0582fd3867affc9fdbd86
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Jul 19 12:22:59 2012 +0200

    Adjust INCLUDE_INSTALL_DIR to new behaviour

diff --git a/README b/README
index 8869765..194456e 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ CMAKE_INSTALL_PREFIX=/usr
 
 Installation location for header files:
 
-INCLUDE_INSTALL_DIR=/usr/include/kolabxml
+INCLUDE_INSTALL_DIR=/usr/include
 
 Building of bindings can be controlled using cmake configuration options:
 PYTHON_BINDINGS
diff --git a/autogen.sh b/autogen.sh
index 6bdedaa..a5fcf3e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,7 +47,7 @@ if [ ${doprep} -eq 1 ]; then
     cmake \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DINCLUDE_INSTALL_DIR=/usr/include/kolabxml \
+        -DINCLUDE_INSTALL_DIR=/usr/include \
         -DLIB_INSTALL_DIR=/usr/lib64 \
         -DPHP_BINDINGS=ON \
         -DPYTHON_BINDINGS=ON \





More information about the commits mailing list