From f8d15a5f7b4b91b7e041ee277d36bfa2271d1d26 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 9 Jan 2008 23:56:07 +0000 Subject: Fix a little breakage with last commit. --- default.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default.mk b/default.mk index 1dc63a21..65f2443e 100644 --- a/default.mk +++ b/default.mk @@ -20,7 +20,7 @@ CONTENTS= ${_CONTENTS}$(shell ${_CONTENTS_SH}) # Recursive rules # Adapted from FreeBSDs bsd.subdir.mk _+_ ?= + -ECHODIR ?= true +ECHODIR ?= echo _SUBDIR = @${_+_}for x in ${SUBDIR}; do \ if test -d $$x; then \ ${ECHODIR} "===> ${DIRPRFX}$$x ($@)"; \ @@ -46,8 +46,8 @@ install:: ${_SUBDIR} install:: ${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 "${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 for x in ${CONF}; do \ if ! test -e ${DESTDIR}${DIR}/$$x; then \ -- cgit v1.2.3