Skip to content
Snippets Groups Projects
Commit 1288e61f authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

MNT: Expand wildcard patterns in _x_install to absorb non-existent default

values (e.g. HFILES = *.h)
parent ca30b112
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ master-install-script: ...@@ -57,7 +57,7 @@ master-install-script:
# - $3: Permission mask to apply to all installed files (e.g. 0755) # - $3: Permission mask to apply to all installed files (e.g. 0755)
# - $4: Space-separated list of target files/directories to install # - $4: Space-separated list of target files/directories to install
define _x_install = define _x_install =
if [ ! -d $(2) ] && echo $(4) | grep -e "^ *$$"; then \ if ! echo $(wildcard $(4)) | grep -q -e "^ *$$"; then \
echo Installing $(1) ; \ echo Installing $(1) ; \
${MKDIR} -p -m 0755 $(2) ; \ ${MKDIR} -p -m 0755 $(2) ; \
fi fi
......
...@@ -22,8 +22,7 @@ CUDALIBS = # Project-specific libraries to link against for CUDA ...@@ -22,8 +22,7 @@ CUDALIBS = # Project-specific libraries to link against for CUDA
# CUDALDFLAGS, below. # CUDALDFLAGS, below.
# Project outputs - these variables control # Project outputs - these variables control
# what gets installed from a project. The # what gets installed from a project. They
# values given below are the defaults - they
# may be customised/overridden in project # may be customised/overridden in project
# Makefiles. # Makefiles.
HFILES = *.h # installed into $FSLDIR/include/$PROJNAME/ HFILES = *.h # installed into $FSLDIR/include/$PROJNAME/
...@@ -38,10 +37,10 @@ FSCRIPTS = # installed into $FSLDIR/bin/, only for internal builds ...@@ -38,10 +37,10 @@ FSCRIPTS = # installed into $FSLDIR/bin/, only for internal builds
RUNTCLS = # link to Runtcl created in $FSLDIR/bin/ which assumes RUNTCLS = # link to Runtcl created in $FSLDIR/bin/ which assumes
# that <file>.tcl has been installed into # that <file>.tcl has been installed into
# $FSLDIR/tcl/ # $FSLDIR/tcl/
PYFILES = *.py # installed into $FSLDIR/etc/fsl/python/$PROJNAME/ PYFILES = *.py # installed into $FSLDIR/etc/fsl/python/$PROJNAME/
TCLFILES = *.tcl # installed into $FSLDIR/tcl/ TCLFILES = *.tcl # installed into $FSLDIR/tcl/
DATAFILES = # installed into $FSLDIR/data/$PROJNAME/ DATAFILES = # installed into $FSLDIR/data/$PROJNAME/
TESTXILES = # not currently used TESTXILES = # not currently used
# Final install destinations # Final install destinations
# for project outputs # for project outputs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment