From bd2f2f39f602e8b59fa5bc5b822cb2c0be9ba38d Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Thu, 10 Jul 2014 15:46:14 +0200 Subject: [pvs2] Revert changes... pvs2 build script has to be fixed --- remote/modules/pvs2/module.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'remote/modules') diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build index 9189d7f3..68acf68a 100644 --- a/remote/modules/pvs2/module.build +++ b/remote/modules/pvs2/module.build @@ -7,19 +7,22 @@ fetch_source() { build() { local SRCDIR="${MODULE_DIR}/src/" + 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!" pinfo "Running cmake" - cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed." + cmake .. || perror "'cmake ..' failed." pinfo "Running make" make || perror "'make' failed." - cd "$MODULE_DIR" > /dev/null + mv pvsmgr pvsclient $DESTDIR + cd - > /dev/null } post_copy() { : -- cgit v1.2.3-55-g7522