From 2be93c3e0e9195df748a7be4e3636db7799b1a72 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 30 Jan 2008 10:02:53 +0000
Subject: Specify install modes for all our files.

---
 mk/scripts.mk   | 8 ++++----
 mk/sys.mk       | 3 +++
 src/rc/Makefile | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mk/scripts.mk b/mk/scripts.mk
index cf980c84..9bee14d1 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -13,18 +13,18 @@ all: ${OBJS}
 
 realinstall: ${BIN} ${CONF} ${CONF_APPEND}
 	if test -n "${DIR}"; then ${INSTALL} -d ${DESTDIR}${DIR} || exit $$?; fi
-	if test -n "${BIN}"; then ${INSTALL} ${BIN} ${DESTDIR}${DIR} || exit $$?; fi
-	if test -n "${INC}"; then ${INSTALL} -m 0644 ${INC} ${DESTDIR}${DIR} || exit $$?; fi
+	if test -n "${BIN}"; then ${INSTALL} -m ${BINMODE} ${BIN} ${DESTDIR}${DIR} || exit $$?; fi
+	if test -n "${INC}"; then ${INSTALL} -m ${INCMODE} ${INC} ${DESTDIR}${DIR} || exit $$?; fi
 	for x in ${CONF}; do \
 	 	if ! test -e ${DESTDIR}${DIR}/$$x; then \
-			${INSTALL} -m 0644 $$x ${DESTDIR}${DIR} || exit $$?; \
+			${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}${DIR} || exit $$?; \
 		fi; \
 	done
 	for x in ${CONF_APPEND}; do \
 		if test -e ${DESTDIR}${DIR}/$$x; then \
 			cat $$x >> ${DESTDIR}${DIR}/$$x || exit $$?; \
 		else \
-	   		${INSTALL} -m 0644 $$x ${DESTDIR}${DIR} || exit $$?; \
+	   		${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}${DIR} || exit $$?; \
 		fi; \
 	done
 
diff --git a/mk/sys.mk b/mk/sys.mk
index 471b7064..fe13b83b 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -9,6 +9,7 @@ RANLIB?=		ranlib
 PICFLAG?=		-fPIC
 
 BINDIR?=		/sbin
+BINMODE?=		0755
 
 INCDIR?=		/usr/include
 INCMODE?=		0444
@@ -20,3 +21,5 @@ SHLIBDIR?=		/${LIBNAME}
 
 MANDIR?=		/usr/share/man/man
 MANMODE?=		0444
+
+CONFMODE=?		0644
diff --git a/src/rc/Makefile b/src/rc/Makefile
index 9d5f4b87..15d07333 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -50,7 +50,7 @@ version.h:
 
 install: all
 	${INSTALL} -d ${DESTDIR}${BINDIR}
-	${INSTALL} ${PROG} ${DESTDIR}${BINDIR}
+	${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
 	${INSTALL} -d ${DESTDIR}/bin
 	for x in ${BINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}/bin/$$x; done
 	${INSTALL} -d ${DESTDIR}/bin
-- 
cgit v1.2.3