Specify install modes for all our files.

This commit is contained in:
Roy Marples 2008-01-30 10:02:53 +00:00
parent 4f6e778758
commit 2be93c3e0e
3 changed files with 8 additions and 5 deletions

View File

@ -13,18 +13,18 @@ all: ${OBJS}
realinstall: ${BIN} ${CONF} ${CONF_APPEND} realinstall: ${BIN} ${CONF} ${CONF_APPEND}
if test -n "${DIR}"; then ${INSTALL} -d ${DESTDIR}${DIR} || exit $$?; fi 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 "${BIN}"; then ${INSTALL} -m ${BINMODE} ${BIN} ${DESTDIR}${DIR} || exit $$?; fi
if test -n "${INC}"; then ${INSTALL} -m 0644 ${INC} ${DESTDIR}${DIR} || exit $$?; fi if test -n "${INC}"; then ${INSTALL} -m ${INCMODE} ${INC} ${DESTDIR}${DIR} || exit $$?; fi
for x in ${CONF}; do \ for x in ${CONF}; do \
if ! test -e ${DESTDIR}${DIR}/$$x; then \ if ! test -e ${DESTDIR}${DIR}/$$x; then \
${INSTALL} -m 0644 $$x ${DESTDIR}${DIR} || exit $$?; \ ${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}${DIR} || exit $$?; \
fi; \ fi; \
done done
for x in ${CONF_APPEND}; do \ for x in ${CONF_APPEND}; do \
if test -e ${DESTDIR}${DIR}/$$x; then \ if test -e ${DESTDIR}${DIR}/$$x; then \
cat $$x >> ${DESTDIR}${DIR}/$$x || exit $$?; \ cat $$x >> ${DESTDIR}${DIR}/$$x || exit $$?; \
else \ else \
${INSTALL} -m 0644 $$x ${DESTDIR}${DIR} || exit $$?; \ ${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}${DIR} || exit $$?; \
fi; \ fi; \
done done

View File

@ -9,6 +9,7 @@ RANLIB?= ranlib
PICFLAG?= -fPIC PICFLAG?= -fPIC
BINDIR?= /sbin BINDIR?= /sbin
BINMODE?= 0755
INCDIR?= /usr/include INCDIR?= /usr/include
INCMODE?= 0444 INCMODE?= 0444
@ -20,3 +21,5 @@ SHLIBDIR?= /${LIBNAME}
MANDIR?= /usr/share/man/man MANDIR?= /usr/share/man/man
MANMODE?= 0444 MANMODE?= 0444
CONFMODE=? 0644

View File

@ -50,7 +50,7 @@ version.h:
install: all install: all
${INSTALL} -d ${DESTDIR}${BINDIR} ${INSTALL} -d ${DESTDIR}${BINDIR}
${INSTALL} ${PROG} ${DESTDIR}${BINDIR} ${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
${INSTALL} -d ${DESTDIR}/bin ${INSTALL} -d ${DESTDIR}/bin
for x in ${BINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}/bin/$$x; done for x in ${BINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}/bin/$$x; done
${INSTALL} -d ${DESTDIR}/bin ${INSTALL} -d ${DESTDIR}/bin