From 0a13902b513abcf648dce4444e38a18826429baf Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Wed, 19 Aug 2020 13:56:46 +0100
Subject: [PATCH] BF: Make directories executable

---
 config/common/rules.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/common/rules.mk b/config/common/rules.mk
index 15225bf..d83d6c0 100644
--- a/config/common/rules.mk
+++ b/config/common/rules.mk
@@ -59,7 +59,7 @@ master-install-script:
 define _x_install =
 	if [ ! -d $(2) ] && echo $(4) | grep -e "^ *$$"; then \
 		echo Installing $(1) ; \
-		${MKDIR} -p -m 0775 $(2) ; \
+		${MKDIR} -p -m 0755 $(2) ; \
 	fi
 	for target in $(4) verylongdummyname ; do \
 		if [ -f $$target ] ; then \
@@ -68,37 +68,37 @@ define _x_install =
 		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) {} \; ; \
+		 	find $(2)/`basename $$target` -type d -exec chmod 0755 {} \; ; \
+		 	find $(2)/`basename $$target` -type f -exec chmod $(3) {} \; ; \
 		fi; \
 	done;
 endef
 
 # Installs PYFILES into $FSLDIR/etc/fsl/python/$PROJNAME/
 pyinstall:
-	@${MKDIR} -p -m 0775 $(dest_PYDIR)
+	@${MKDIR} -p -m 0755 $(dest_PYDIR)
 	@$(call _x_install,"python scripts",${dest_PYDIR}/${PROJNAME}/,0644,${PYFILES})
 
 # Installs AFILES and SOFILES into $FSLDIR/lib/
 libinstall:
-	@${MKDIR} -p -m 0775 $(dest_LIBDIR)
+	@${MKDIR} -p -m 0755 $(dest_LIBDIR)
 	@$(call _x_install,"library files",${dest_LIBDIR},0644,${AFILES} ${SOFILES})
 
 # Installs HFILES into $FSLDIR/include/$PROJNAME/
 hdrinstall:
-	@${MKDIR} -p -m 0775 $(dest_INCDIR)
+	@${MKDIR} -p -m 0755 $(dest_INCDIR)
 	@$(call _x_install,"header files",${dest_INCDIR}/${PROJNAME}/,0644,${HFILES})
 
 # Installs DATAFILES into $FSLDIR/data/$PROJNAME/
 datainstall:
-	@${MKDIR} -p -m 0775 $(dest_DATADIR)
+	@${MKDIR} -p -m 0755 $(dest_DATADIR)
 	@$(call _x_install,"data files",${dest_DATADIR}/${PROJNAME}/,0644,${DATAFILES})
 
 # Installs:
 #   - XFILES into $FSLDIR/bin/
 #   - SCRIPTS into $FSLDIR/bin/
 exeinstall:
-	@${MKDIR} -p -m 0775 $(dest_BINDIR)
+	@${MKDIR} -p -m 0755 $(dest_BINDIR)
 	@$(call _x_install,"binaries",${dest_BINDIR}/,0755,${XFILES})
 	@$(call _x_install,"scripts",${dest_BINDIR}/,0755,${SCRIPTS})
 
@@ -107,8 +107,8 @@ exeinstall:
 #  - TCLFILES into $FSLDIR/tcl/
 #  - RUNTCLS into $FSLDIR/bin/
 tclinstall:
-	@${MKDIR} -p -m 0775 $(dest_TCLDIR)
-	@${MKDIR} -p -m 0775 $(dest_BINDIR)
+	@${MKDIR} -p -m 0755 $(dest_TCLDIR)
+	@${MKDIR} -p -m 0755 $(dest_BINDIR)
 	@$(call _x_install,"tcl scripts",${dest_TCLDIR}/,0755,${TCLFILES})
 	@# create RUNTCLS links
 	@for lntarget in ${RUNTCLS} verylongdummyname ; do \
-- 
GitLab