diff options
| author | eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2011-11-10 16:14:49 +0000 |
|---|---|---|
| committer | eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2011-11-10 16:14:49 +0000 |
| commit | aa506d1bf306e4265344a09e306e163c7a0480d7 (patch) | |
| tree | 877f00b2019df98c99431303fd50d9d21db585bc | |
| parent | b2d073a718faab1a67ac59a213a69f8e3a2cd3ff (diff) | |
Accept LORENE_DIR=BUILD case-independently
Also re-indent, remove some superfluous / characters.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@32 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
| -rw-r--r-- | LORENE.sh | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -30,7 +30,9 @@ fi # Build ################################################################################ -if [ -z "${LORENE_DIR}" -o "${LORENE_DIR}" = 'BUILD' ]; then +if [ -z "${LORENE_DIR}" \ + -o "$(echo "${LORENE_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ] +then echo "BEGIN MESSAGE" echo "Building LORENE..." echo "END MESSAGE" @@ -42,14 +44,14 @@ if [ -z "${LORENE_DIR}" -o "${LORENE_DIR}" = 'BUILD' ]; then BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${LORENE_INSTALL_DIR}" ]; then echo "BEGIN MESSAGE" - echo "LORENE install directory, LORENE_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "LORENE install directory, LORENE_INSTALL_DIR, not set. Installing in the default configuration location." echo "END MESSAGE" - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} else echo "BEGIN MESSAGE" - echo "LORENE install directory, LORENE_INSTALL_DIR, selected. Installing LORENE at ${LORENE_INSTALL_DIR} " + echo "LORENE install directory, LORENE_INSTALL_DIR, selected. Installing LORENE at ${LORENE_INSTALL_DIR}" echo "END MESSAGE" - INSTALL_DIR=${LORENE_INSTALL_DIR} + INSTALL_DIR=${LORENE_INSTALL_DIR} fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} LORENE_DIR=${INSTALL_DIR} @@ -157,10 +159,10 @@ EOF echo "LORENE: Installing..." mv ${BUILD_DIR}/${NAME}/Lib ${INSTALL_DIR} mkdir ${INSTALL_DIR}/C++ - mv ${BUILD_DIR}/${NAME}/C++/Include ${INSTALL_DIR}/C++/ + mv ${BUILD_DIR}/${NAME}/C++/Include ${INSTALL_DIR}/C++ mkdir ${INSTALL_DIR}/Export mkdir ${INSTALL_DIR}/Export/C++ - mv ${BUILD_DIR}/${NAME}/Export/C++/Include ${INSTALL_DIR}/Export/C++/ + mv ${BUILD_DIR}/${NAME}/Export/C++/Include ${INSTALL_DIR}/Export/C++ popd echo "LORENE: Cleaning up..." |