diff --git a/config/common/rules.mk b/config/common/rules.mk
index c4d88af66dd4cff29f564f88ed78480a3f126c5d..1ff53fb85cf2e29876608457562230a7e209049c 100644
--- a/config/common/rules.mk
+++ b/config/common/rules.mk
@@ -57,7 +57,7 @@ master-install-script:
 #  - $3: Permission mask to apply to all installed files (e.g. 0755)
 #  - $4: Space-separated list of target files/directories to install
 define _x_install =
-	if [ ! -d $(2) ] && echo $(4) | grep -e "^ *$$"; then \
+	if ! echo $(wildcard $(4)) | grep -q -e "^ *$$"; then \
 		echo Installing $(1) ; \
 		${MKDIR} -p -m 0755 $(2) ; \
 	fi
diff --git a/config/common/vars.mk b/config/common/vars.mk
index ebe67f4769d3c82436b5be6674e141300c7aa90e..afd77a75f7065665f7d0777a68ae1247d6a676e6 100644
--- a/config/common/vars.mk
+++ b/config/common/vars.mk
@@ -22,8 +22,7 @@ CUDALIBS        = # Project-specific libraries to link against for CUDA
                   # CUDALDFLAGS, below.
 
 # Project outputs - these variables control
-# what gets installed from a project. The
-# values given below are the defaults - they
+# what gets installed from a project. They
 # may be customised/overridden in project
 # Makefiles.
 HFILES       = *.h    # installed into $FSLDIR/include/$PROJNAME/
@@ -38,10 +37,10 @@ FSCRIPTS     =        # installed into $FSLDIR/bin/, only for internal builds
 RUNTCLS      =        # link to Runtcl created in $FSLDIR/bin/ which assumes
                       # that <file>.tcl has been installed into
                       # $FSLDIR/tcl/
-PYFILES   = *.py      # installed into $FSLDIR/etc/fsl/python/$PROJNAME/
-TCLFILES  = *.tcl     # installed into $FSLDIR/tcl/
-DATAFILES =           # installed into $FSLDIR/data/$PROJNAME/
-TESTXILES =           # not currently used
+PYFILES      = *.py   # installed into $FSLDIR/etc/fsl/python/$PROJNAME/
+TCLFILES     = *.tcl  # installed into $FSLDIR/tcl/
+DATAFILES    =        # installed into $FSLDIR/data/$PROJNAME/
+TESTXILES    =        # not currently used
 
 # Final install destinations
 # for project outputs