From a815d11a8c4669c17f9d895d6e36ce3ccbed7321 Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Thu, 10 Jul 2014 14:00:41 +0200 Subject: [pvs2] Adjusted module.build to build in /opt/openslx/bin --- remote/modules/pvs2/module.build | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'remote/modules') diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build index edcb49b0..9189d7f3 100644 --- a/remote/modules/pvs2/module.build +++ b/remote/modules/pvs2/module.build @@ -7,8 +7,7 @@ fetch_source() { build() { local SRCDIR="${MODULE_DIR}/src/" - local BUILDDIR="${MODULE_DIR}/src/build" - local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/pvs2" + local DESTDIR="$MODULE_BUILD_DIR/opt/openslx/bin" # first activate qt 4 activate_qt 4 @@ -16,13 +15,10 @@ build() { mkdir -p "$DESTDIR" cd "$DESTDIR" || perror "Could not cd to $DESTDIR!" - mkdir "$BUILDDIR" - cd "$BUILDDIR" pinfo "Running cmake" - cmake .. || perror "'cmake $SRCDIR' failed." + cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed." pinfo "Running make" make || perror "'make' failed." - mv pvsmgr pvsclient "$DESTDIR" cd "$MODULE_DIR" > /dev/null } post_copy() { -- cgit v1.2.3-55-g7522