summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-30 10:02:53 +0000
committerRoy Marples <roy@marples.name>2008-01-30 10:02:53 +0000
commit2be93c3e0e9195df748a7be4e3636db7799b1a72 (patch)
treed7278c5c789cfa7927b2c075b5438810a334a494 /mk
parent4f6e778758a03ceec5a9b1caf09a4d1e7d171fb4 (diff)
downloadopenrc-2be93c3e0e9195df748a7be4e3636db7799b1a72.tar.gz
openrc-2be93c3e0e9195df748a7be4e3636db7799b1a72.tar.bz2
openrc-2be93c3e0e9195df748a7be4e3636db7799b1a72.tar.xz
Specify install modes for all our files.
Diffstat (limited to 'mk')
-rw-r--r--mk/scripts.mk8
-rw-r--r--mk/sys.mk3
2 files changed, 7 insertions, 4 deletions
diff --git a/mk/scripts.mk b/mk/scripts.mk
index cf980c8..9bee14d 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 471b706..fe13b83 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