From fa3675d2989e16418429007149457017b69c487d Mon Sep 17 00:00:00 2001 From: Paul McCarthy <pauldmccarthy@gmail.com> Date: Wed, 8 Dec 2021 17:20:56 +0000 Subject: [PATCH] MNT: FSLDEVDIR doesn't have to exist --- etc/fslconf/fsl-devel.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/etc/fslconf/fsl-devel.sh b/etc/fslconf/fsl-devel.sh index 8af3104..c97a3d4 100644 --- a/etc/fslconf/fsl-devel.sh +++ b/etc/fslconf/fsl-devel.sh @@ -13,15 +13,19 @@ # FSLCONFDIR contains the FSL Makefile machinery # for compiling and installing FSL Makefile-based # projects. -if [ ! -d "$FSLCONFDIR" ]; then - export FSLCONFDIR=$FSLDIR/config +if [ ! -d "${FSLCONFDIR}" ]; then + export FSLCONFDIR=${FSLDIR}/config fi # FSLDEVDIR is an optional installation destination # for development, so that locally built projects # can be installed separately from FSLDIR. -if [ ! -d "$FSLDEVDIR" ]; then - export FSLDEVDIR=$FSLDIR +# +# FSLDEVDIR doesn't necessarily have to exist, as +# it will be created the first time "make install" +# is run in a project directory. +if [ -z "${FSLDEVDIR}" ]; then + export FSLDEVDIR=${FSLDIR} fi source $FSLDIR/etc/fslconf/fsl.sh -- GitLab