Merge pull request #503 from jsberg-bnl/allow-no-utilities

Allow gnu_utilities_src to be absent
bmad-sim · Sep 23, 2023 · 14c7ef8 · 14c7ef8
2 parents 9ace86b + 8212d84
commit 14c7ef8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/util/acc_build_common b/util/acc_build_common
@@ -822,7 +822,7 @@ if ( [ "${1}" == "-debug" ] || [ "${1}" == "-production" ] ) ; then
  func_set_fortran_flags
  [ "${PROJ_DIR_NAME}" == "LAPACK95" ] || func_make_build_directory
  func_set_LD_LIBRARY_PATH 
- func_install_utilities
+ [ -d ${BASE_DIR}/gnu_utilities_src ] && func_install_utilities
 
  echo -e "\nThe search PATH is: ${PATH}\n"
  echo -e "\nThe search LD_LIBRARY_PATH is: ${LD_LIBRARY_PATH}\n" 

diff --git a/util/dist_source_me b/util/dist_source_me
@@ -18,7 +18,7 @@
 #-----------------------------------------------------------------
 func_is_dir_toplevel () {
 
- DIST_TOPLEVEL_CHECKLIST="bmad build_system util gnu_utilities_src"
+ DIST_TOPLEVEL_CHECKLIST="bmad build_system util"
  TESTDIR=${1}
  RETVAL="Y"