MNT: Use a generic install routine for exeinstall, hdrinstall, libinstall,

tclinstall, etc etc. Clean up rules.mk

config/common/rules.mk

@@ -42,150 +42,90 @@ master-install-script:
 		exit 4 ; \
 	fi;
 	@${MAKE} all
-	@${MAKE} install-non-src-files
-
-install-non-src-files:
 	@${MAKE} exeinstall
-	@${MAKE} install-non-src-exe-files
-
-install-non-src-exe-files:
 	@${MAKE} hdrinstall
 	@${MAKE} libinstall
 	@${MAKE} tclinstall
 	@${MAKE} pyinstall
 	@${MAKE} datainstall
 
-tclinstall:
-	@echo " "
-	@echo "Installing tcl scripts"
-	@if [ ! -d ${dest_TCLDIR} ] ; then \
-		${MKDIR} -p ${dest_TCLDIR} ; \
-		${CHMOD} g+w ${dest_TCLDIR} ; \
-		fi
-	@install_yn=no; \
-	for tclfile in ${TCLFILES} verylongdummyname ; do \
-		if [ -f $$tclfile ] ; then \
-			install_yn=yes; \
-			echo ${INSTALL} -m 0775 $$tclfile ${dest_TCLDIR}/ ; \
-			${INSTALL}      -m 0775 $$tclfile ${dest_TCLDIR}/ ; \
-		elif [ -d $$tclfile ]; then \
-			echo ${CP} -r $$tclfile ${dest_TCLDIR}/ ; \
-		 	${CP}      -r $$tclfile ${dest_TCLDIR}/ ; \
-		fi; \
-	done; \
-	if [ $$install_yn = "yes" ] ; then \
-		( cd ${dest_TCLDIR} ; echo 'auto_mkindex . *.tcl' | ${TCLSH} ) \
+# Generic routine used to install
+# XFILES, PYFILES, SCRIPTS, etc etc
+# Expects four arguments:
+#  - $1: Label, just used to print a descriptive message
+#  - $2: Destination directory for installation
+#  - $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 =
+	echo Installing $(1)
+	if [ ! -d $(2) ] ; then \
+		${MKDIR} -p $(2) ; \
+		${CHMOD} g+w $(2) ; \
 	fi
+	for target in $(4) verylongdummyname ; do \
+		if [ -f $$target ] ; then \
+			echo ${INSTALL} -m $(3) $$target $(2)/ ; \
+			${INSTALL}      -m $(3) $$target $(2)/ ; \
+		elif [ -d $$target ]; then \
+			echo ${CP} -r $$target $(2)/ ; \
+		 	${CP}      -r $$target $(2)/ ; \
+		 	find $(2)/$$target -type d -exec chmod $(3) {} \; ; \
+		 	find $(2)/$$target -type f -exec chmod $(3) {} \; ; \
+		fi; \
+	done;
+endef
 
+# Installs PYFILES into $FSLDIR/etc/fsl/python/$PROJNAME/
 pyinstall:
-	@echo " "
-	@echo "Installing python scripts"
-	@if [ ! -d ${dest_PYDIR}/${PROJNAME} ] ; then \
-		${MKDIR} -p ${dest_PYDIR}/${PROJNAME} ; \
-		${CHMOD} g+w ${dest_PYDIR}/${PROJNAME} ; \
-		fi
-	@install_yn=no; \
-	for pyfile in ${PYFILES} verylongdummyname ; do \
-		if [ -f $$pyfile ] ; then \
-			install_yn=yes; \
-			${INSTALL} -m 0775 $$pyfile ${dest_PYDIR}/${PROJNAME}/ ; \
-			echo ${INSTALL} -m 0775 $$pyfile ${dest_PYDIR}/${PROJNAME}/ ; \
-		fi \
-	done;
+	@$(call _x_install,"python scripts",${dest_PYDIR}/${PROJNAME}/,0644,${PYFILES})
 
+# Installs AFILES and SOFILES into $FSLDIR/lib/
+libinstall:
+	@$(call _x_install,"library files",${dest_LIBDIR},0644,${AFILES} ${SOFILES})
+
+# Installs HFILES into $FSLDIR/include/$PROJNAME/
+hdrinstall:
+	@$(call _x_install,"header files",${dest_INCDIR}/${PROJNAME}/,0644,${HFILES})
+
+# Installs DATAFILES into $FSLDIR/data/$PROJNAME/
+datainstall:
+	@$(call _x_install,"data files",${dest_DATAIR}/${PROJNAME}/,0644,${DATAFILES})
+
+# Installs:
+#   - XFILES into $FSLDIR/bin/
+#   - SCRIPTS into $FSLDIR/bin/
 exeinstall:
-	@echo " "
-	@echo "Installing stable binaries"
-	@if [ ! -d ${dest_BINDIR} ] ; then \
-		${MKDIR} -p ${dest_BINDIR} ; \
-		${CHMOD} g+w ${dest_BINDIR} ; \
-		fi
-	@for exefile in ${XFILES} ${SCRIPTS} verylongdummyname ; do \
-		if [ -f $$exefile ] ; then \
-			${INSTALL} -m 0775 $$exefile ${dest_BINDIR}/ ; \
-			echo ${INSTALL} -m 0775 $$exefile ${dest_BINDIR}/ ; \
-		fi \
-	done
+	@$(call _x_install,"binaries",${dest_BINDIR}/,0755,${XFILES})
+	@$(call _x_install,"scripts",${dest_BINDIR}/,0755,${SCRIPTS})
+
+
+# Installs:
+#  - TCLFILES into $FSLDIR/tcl/
+#  - RUNTCLS into $FSLDIR/bin/
+tclinstall:
+	@$(call _x_install,"tcl scripts",${dest_TCLDIR}/,0755,${TCLFILES})
+	@# make sure that $FSLDIR/bin/ exists
+	@$(call _x_install,"tcl scripts",${dest_BINDIR}/,0755,)
+	@# create RUNTCLS links
 	@for lntarget in ${RUNTCLS} verylongdummyname ; do \
 		if [ $$lntarget != verylongdummyname ] ; then \
 			if [ `uname` = Darwin -o X`uname | grep CYGWIN`X != XX ] ; then \
 				lntarget=$${lntarget}_gui ; \
 			fi ; \
-			cd ${dest_BINDIR} ; ${RM} -f /tmp/fslgrot $$lntarget ; \
+			cd ${dest_BINDIR} ; ${RM} -f $$lntarget ; \
 			ln -s Runtcl $$lntarget ; \
 			echo ln -s Runtcl $$lntarget ; \
 		fi \
 	done
-	@for lntarget in ${RUNAVWS} verylongdummyname ; do \
-		if [ $$lntarget != verylongdummyname ] ; then \
-			cd ${dest_BINDIR} ; ${RM} -f /tmp/fslgrot $$lntarget ; \
-			ln -s runavw $$lntarget ; \
-			echo ln -s runavw $$lntarget ; \
-		fi \
-	done
-
-libinstall:
-	@echo " "
-	@echo "Installing stable library archives"
-	@if [ ! -d ${dest_LIBDIR} ] ; then \
-		${MKDIR} -p ${dest_LIBDIR} ; \
-		${CHMOD} g+w ${dest_LIBDIR} ; \
-		fi
-	@for libfile in ${AFILES} ${SOFILES} verylongdummyname ; do \
-		if [ -f $$libfile ] ; then \
-			${INSTALL} -m 0664 $$libfile ${dest_LIBDIR} ; \
-			echo  ${INSTALL} -m 0664 $$libfile ${dest_LIBDIR} ; \
-			if [ `uname` = Darwin -o X`uname | grep CYGWIN`X != XX ] ; then \
-				${RANLIB} ${dest_LIBDIR}/$$libfile ; \
-			fi ; \
-		fi \
-	done
-
-hdrinstall:
-	@echo " "
-	@echo "Installing stable header files"
-	@if [ ! -d ${dest_INCDIR} ] ; then \
-		${MKDIR} -p ${dest_INCDIR} ; \
-		${CHMOD} g+w ${dest_INCDIR} ; \
-		fi
-	@if [ ! -d ${dest_INCDIR}/${PROJNAME} ] ; then \
-		${MKDIR} -p ${dest_INCDIR}/${PROJNAME} ; \
-		${CHMOD} g+w ${dest_INCDIR}/${PROJNAME} ; \
-		fi
-	@for hdrfile in ${HFILES} verylongdummyname ; do \
-		if [ -f $$hdrfile ] ; then \
-			echo ${INSTALL} -m 0664 $$hdrfile ${dest_INCDIR}/${PROJNAME}/ ; \
-			${INSTALL} -m 0664 $$hdrfile ${dest_INCDIR}/${PROJNAME}/ ; \
-		elif [ -d $$hdrfile ]; then \
-			echo ${CP} -r $$hdrfile ${dest_INCDIR}/${PROJNAME}/ ; \
-		 	${CP} -r $$hdrfile ${dest_INCDIR}/${PROJNAME}/ ; \
-		 	find ${dest_INCDIR}/${PROJNAME}/ -type d -exec chmod 0755 {} \; ; \
-		 	find ${dest_INCDIR}/${PROJNAME}/ -type f -exec chmod 0644 {} \; ; \
-		fi; \
-	done
-
-
-datainstall:
-	@echo " "
-	@echo "Installing data files"
-	@if [ ! -d ${dest_DATADIR} ] ; then \
-		${MKDIR} -p ${dest_DATADIR} ; \
-		${CHMOD} g+w ${dest_DATADIR} ; \
-		fi
-	@if [ ! -d ${dest_DATADIR}/${PROJNAME} ] ; then \
-		${MKDIR} -p ${dest_DATADIR}/${PROJNAME} ; \
-		${CHMOD} g+w ${dest_DATADIR}/${PROJNAME} ; \
-		fi
-	@for datafile in ${DATAFILES} verylongdummyname ; do \
-		if [ -f $$datafile ] ; then \
-			echo ${INSTALL} -m 0664 $$datafile ${dest_DATADIR}/${PROJNAME}/ ; \
-			${INSTALL} -m 0664 $$datafile ${dest_DATADIR}/${PROJNAME}/ ; \
-		elif [ -d $$datafile ]; then \
-			echo ${CP} -r $$datafile ${dest_DATADIR}/${PROJNAME}/ ; \
-		 	${CP} -r $$datafile ${dest_DATADIR}/${PROJNAME}/ ; \
-		 	find ${dest_DATADIR}/${PROJNAME}/ -type d -exec chmod 0755 {} \; ; \
-		 	find ${dest_DATADIR}/${PROJNAME}/ -type f -exec chmod 0644 {} \; ; \
+	@# index installed TCL files
+	@install_yn=no;
+	@for tclfile in ${TCLFILES} verylongdummyname ; do \
+		if [ -e $$tclfile ] ; then \
+			install_yn=yes; \
 		fi; \
-	done
+	done;
+	@if [ $$install_yn = "yes" ] ; then \
+		(cd ${dest_TCLDIR} ; echo 'auto_mkindex . *.tcl' | ${TCLSH} ) \
+	fi
 
 include depend.mk

config/common/vars.mk

@@ -30,6 +30,7 @@ HFILES    = *.h    # installed into $FSLDIR/include/$PROJNAME/
 AFILES    = *.a    # installed into $FSLDIR/lib/
 SOFILES   = *.so   # installed into $FSLDIR/lib/
 XFILES    =        # installed into $FSLDIR/bin/
+FXFILES   =        # installed into $FSLDIR/bin/, only for internal builds
 SCRIPTS   =        # installed into $FSLDIR/bin/
 RUNTCLS   =        # link to Runtcl created in $FSLDIR/bin/ which assumes
                    # that <file>.tcl has been installed into