From 6241700c5989c559b8217d1e3d4afe2318892a81 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Mon, 27 Oct 2008 13:11:07 +0000 Subject: [PATCH] Correction for MULTIPR building --- config_files/build.csh | 4 ++-- config_files/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config_files/build.csh b/config_files/build.csh index 4808cf0..3e16d5c 100755 --- a/config_files/build.csh +++ b/config_files/build.csh @@ -302,12 +302,12 @@ foreach module (${modules}) set cfg_file=configure.ac if ( ! -e ${module_src}/${cfg_file} ) then set cfg_file=configure.in.base + endif + if ( -e ${module_src}/${cfg_file} ) then set vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'` if ( "$vx" == "" ) then set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` endif - else - set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` endif set px=${BUILD_DIR}/${module} if ( "$prefix" != "" ) then diff --git a/config_files/build.sh b/config_files/build.sh index 6aae399..d075678 100755 --- a/config_files/build.sh +++ b/config_files/build.sh @@ -309,12 +309,12 @@ for module in ${modules}; do cfg_file=configure.ac if [ ! -e ${module_src}/${cfg_file} ] ; then cfg_file=configure.in.base + fi + if [ -e ${module_src}/${cfg_file} ] ; then vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'` if [ "$vx" == "" ] ; then vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` fi - else - vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` fi px=${BUILD_DIR}/${module} if [ "$prefix" != "" ] ; then -- 2.39.2