summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remote/modules/pvs2/module.build17
1 files changed, 8 insertions, 9 deletions
diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build
index edcb49b0..68acf68a 100644
--- a/remote/modules/pvs2/module.build
+++ b/remote/modules/pvs2/module.build
@@ -7,23 +7,22 @@ fetch_source() {
build() {
local SRCDIR="${MODULE_DIR}/src/"
- local BUILDDIR="${MODULE_DIR}/src/build"
- local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/pvs2"
+ local BUILDDIR="$SRCDIR/build/"
+ local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/bin"
# first activate qt 4
activate_qt 4
- mkdir -p "$DESTDIR"
- cd "$DESTDIR" || perror "Could not cd to $DESTDIR!"
+ mkdir -p "$DESTDIR" || perror "Could not mkdir $DESTDIR!"
+ mkdir -p "$BUILDDIR" || perror "Could not mkdir $BUILDDIR!"
+ cd "$BUILDDIR" || perror "Could not cd to $BUILDDIR!"
- mkdir "$BUILDDIR"
- cd "$BUILDDIR"
pinfo "Running cmake"
- cmake .. || perror "'cmake $SRCDIR' failed."
+ cmake .. || perror "'cmake ..' failed."
pinfo "Running make"
make || perror "'make' failed."
- mv pvsmgr pvsclient "$DESTDIR"
- cd "$MODULE_DIR" > /dev/null
+ mv pvsmgr pvsclient $DESTDIR
+ cd - > /dev/null
}
post_copy() {
: