From b95edfbec853e8a6abdcd818b52b6de9318670e7 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 7 Aug 2014 16:26:19 +1000 Subject: [PATCH] Only run extract_version.sh once --- site_ansto/make_config.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/site_ansto/make_config.sh b/site_ansto/make_config.sh index 710c5644..ee07e28d 100755 --- a/site_ansto/make_config.sh +++ b/site_ansto/make_config.sh @@ -3,12 +3,10 @@ # Write a new made_config.h, but only if changed # rm -f made_config_new.h -SICS_SITE=$(bash extract_version.sh SITE) -SICS_VERSION=$(bash extract_version.sh VERSION) -SICS_REVISION=$(bash extract_version.sh REVISION) +source extract_version.sh echo "#define SICS_SITE \"$SICS_SITE\"" >> made_config_new.h -echo "#define SICS_VERSION \"$SICS_VERSION\"" >> made_config_new.h -echo "#define SICS_REVISION \"$SICS_REVISION\"" >> made_config_new.h +echo "#define SICS_VERSION \"$SICS_VER\"" >> made_config_new.h +echo "#define SICS_REVISION \"$SICS_REV\"" >> made_config_new.h if [[ -f /usr/include/valgrind/memcheck.h ]] then echo "#define SICS_VALGRIND" >> made_config_new.h