From 0e797b7933a937967716ab2faf10287d12a6ebde Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 14 Oct 2015 18:31:45 +0200
Subject: [PATCH] Pmodules/modbuild: - adapted to new location of buildblocks

---
 Pmodules/modbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Pmodules/modbuild b/Pmodules/modbuild
index 2d2c14b..730b88c 100755
--- a/Pmodules/modbuild
+++ b/Pmodules/modbuild
@@ -279,7 +279,7 @@ if [[ -r ${BUILD_BLOCK_DIR}/../config/${pmodule_environment} ]]; then
 elif [[ -n ${PMODULES_ROOT} ]] && [[ -n ${PMODULES_CONFIG_DIR} ]] && \
      [[ -r ${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/${pmodule_environment} ]]; then
 	source ${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/${pmodule_environment}
-	declare -rx BUILD_BASEDIR=$(std::get_abspath "${BUILD_BLOCK_DIR}/../../..")
+	declare -rx BUILD_BASEDIR=$(std::get_abspath "${BUILD_BLOCK_DIR}/../..")
 	bootstrap='no'
 
 else
@@ -293,7 +293,7 @@ declare -x  PMODULES_TMPDIR
 declare -x  PMODULES_DISTFILESDIR
 
 declare -xr BUILD_SCRIPTSDIR="${BUILD_BASEDIR}/scripts"
-declare -xr BUILD_VERSIONSFILE="${BUILD_CONFIGDIR}/config/versions.conf"
+declare -xr BUILD_VERSIONSFILE="${BUILD_BASEDIR}/config/versions.conf"
 
 # source BASH library with standard functions
 ((ok=1))