summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2009-10-31 20:12:54 +0100
committerTreeve Jelbert2009-10-31 20:12:54 +0100
commit2f04b28375e61e948deb6dc78674c31c04a73c45 (patch)
tree3af6db9a86529089b1adee8811e5e93490e85630
parent7ed44b1978b4b2e93743054bda2c46e4f7ed36f8 (diff)
FUNCTIONS - fix cmake-build
-rw-r--r--ChangeLog3
-rwxr-xr-xFUNCTIONS2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ff2295679..2ce67e0cd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-10-31 Treeve Jelbert <treeve@sourcemage.org>
+ * FUNCTIONS: fix cmake_build if OPTS is non-null
+
2009-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* utils/zsync: new spell, a file transfer tool
diff --git a/FUNCTIONS b/FUNCTIONS
index e3131d8f12..c18ebc3968 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -512,7 +512,7 @@ cmake_build() {
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
cd build &&
- cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+ cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS ../ &&
make
}