From 1b4bd2423b8e66b6b8980aea3107d44818bb5439 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Mon, 2 Nov 2015 20:38:17 +0100 Subject: [PATCH] deal.II: again, setting builddir and installpath correctly --- deal.II-toolchain/packages/dealii-stable.package | 7 +++---- deal.II-toolchain/packages/dealii.package | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/deal.II-toolchain/packages/dealii-stable.package b/deal.II-toolchain/packages/dealii-stable.package index 5e658e3..6a01e73 100644 --- a/deal.II-toolchain/packages/dealii-stable.package +++ b/deal.II-toolchain/packages/dealii-stable.package @@ -5,7 +5,6 @@ SOURCE=https://github.com/dealii/ PACKING=git BUILDCHAIN=cmake -package_specific_setup () { - BUILDDIR=${BUILD_PATH}/deal.II-${VERSION} - INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} -} +######################################################################### +BUILDDIR=${BUILD_PATH}/deal.II-${VERSION} +INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package index 2067225..7151098 100644 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@ -5,17 +5,15 @@ SOURCE=https://github.com/dealii/ PACKING=git BUILDCHAIN=cmake +######################################################################### +BUILDDIR=${BUILD_PATH}/deal.II-${VERSION} +INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} -package_specific_setup () { - BUILDDIR=${BUILD_PATH}/deal.II-${VERSION} - INSTALL_PATH=${ORIG_INSTALL_PATH}/deal.II-${VERSION} -} - +######################################################################### CONFOPTS=" \ ${DEAL_CONFOPTS} \ " -######################################################################### if [ ! -z "${ARPACK_DIR}" ]; then CONFOPTS="\ ${CONFOPTS} \ -- 2.39.5