From 74bff8a931f85ade7b20f2ff3708d5d01081b672 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 25 Mar 2008 16:59:26 +0000 Subject: DIR should be prefixed already. --- mk/scripts.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mk/scripts.mk b/mk/scripts.mk index 1bb5662b..e6889fc4 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -25,21 +25,21 @@ all: ${OBJS} realinstall: ${BIN} ${CONF} ${CONF_APPEND} @if test -n "${DIR}"; then \ - ${ECHO} ${INSTALL} -d ${DESTDIR}/${PREFIX}${DIR}; \ - ${INSTALL} -d ${DESTDIR}/${PREFIX}${DIR} || exit $$?; \ + ${ECHO} ${INSTALL} -d ${DESTDIR}/${DIR}; \ + ${INSTALL} -d ${DESTDIR}/${DIR} || exit $$?; \ fi @if test -n "${BIN}"; then \ - ${ECHO} ${INSTALL} -m ${BINMODE} ${BIN} ${DESTDIR}/${PREFIX}${DIR}; \ - ${INSTALL} -m ${BINMODE} ${BIN} ${DESTDIR}/${PREFIX}${DIR} || exit $$?; \ + ${ECHO} ${INSTALL} -m ${BINMODE} ${BIN} ${DESTDIR}/${DIR}; \ + ${INSTALL} -m ${BINMODE} ${BIN} ${DESTDIR}/${DIR} || exit $$?; \ fi @if test -n "${INC}"; then \ - ${ECHO} ${INSTALL} -m ${INCMODE} ${INC} ${DESTDIR}/${PREFIX}${DIR}; \ - ${INSTALL} -m ${INCMODE} ${INC} ${DESTDIR}/${PREFIX}${DIR} || exit $$?; \ + ${ECHO} ${INSTALL} -m ${INCMODE} ${INC} ${DESTDIR}/${DIR}; \ + ${INSTALL} -m ${INCMODE} ${INC} ${DESTDIR}/${DIR} || exit $$?; \ fi @for x in ${CONF}; do \ if ! test -e ${DESTDIR}/${PREFIX}${DIR}/$$x; then \ - ${ECHO} ${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}/${PREFIX}${DIR}; \ - ${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}/${PREFIX}${DIR} || exit $$?; \ + ${ECHO} ${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}/${DIR}; \ + ${INSTALL} -m ${CONFMODE} $$x ${DESTDIR}/${DIR} || exit $$?; \ fi; \ done -- cgit v1.2.3