summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-04-22 21:48:05 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-04-22 21:48:05 (GMT)
commit12a38d6db9a200453e5c7640d33754ff99061f15 (patch)
treec50d356f289fd1113312fc065eca7466df565f8c
parentd1fa3612a677f516212133dac5f8e0ca7466f102 (diff)
parentce2b3d6c0b5cc426144ad1b3494ba455ec56e91d (diff)
downloadlibkolabxml-12a38d6db9a200453e5c7640d33754ff99061f15.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/libkolabxml
-rw-r--r--README-Mac.txt2
-rw-r--r--src/php/CMakeLists.txt4
2 files changed, 4 insertions, 2 deletions
diff --git a/README-Mac.txt b/README-Mac.txt
index 2b77400..34ac1f5 100644
--- a/README-Mac.txt
+++ b/README-Mac.txt
@@ -8,7 +8,7 @@
rm -rf build/
mkdir -p build
cd build
-cmake -DPHP_INSTALL_DIR:PATH=/usr/lib/php/extensions/no-debug-non-zts-20090626 -DCMAKE_INCLUDE_PATH:PATH=/opt/local/include -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
+cmake -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR:PATH=/usr/lib/php/extensions/no-debug-non-zts-20090626 -DCMAKE_INCLUDE_PATH:PATH=/opt/local/include -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
make
sudo make install
diff --git a/src/php/CMakeLists.txt b/src/php/CMakeLists.txt
index f21e8d2..fb10d58 100644
--- a/src/php/CMakeLists.txt
+++ b/src/php/CMakeLists.txt
@@ -31,7 +31,9 @@ if (PHP4_FOUND)
configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
- set(PHP_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/phpbindings" CACHE STRING "Install directory for php bindings.")
+ if (NOT PHP_INSTALL_DIR)
+ set(PHP_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/phpbindings" CACHE STRING "Install directory for php bindings.")
+ endif()
install(TARGETS phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR})