summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-07-19 10:23:24 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-07-19 10:23:24 (GMT)
commitde64c8fd00a9bcc58f64b5875de5bcbe519e5a62 (patch)
tree19a829c6d3e83ac0f830419dfba77b46485eb1c1
parent78c2c1f2cb8738579a84bf14f2dea9ad3d72a76c (diff)
parent6d8eebf6b11435bf32c0582fd3867affc9fdbd86 (diff)
downloadlibkolabxml-de64c8fd00a9bcc58f64b5875de5bcbe519e5a62.tar.gz
Merge branch 'master' into libkolabxml-0.7libkolabxml-0.7.0
-rw-r--r--README2
-rwxr-xr-xautogen.sh2
2 files changed, 2 insertions, 2 deletions
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 59e1117..e574c61 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 \