diff options
| author | Roy Marples <roy@marples.name> | 2008-01-09 23:56:07 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-09 23:56:07 +0000 |
| commit | f8d15a5f7b4b91b7e041ee277d36bfa2271d1d26 (patch) | |
| tree | df923b631d7fa79d7e7716aa66444c3fdf62ae91 | |
| parent | 5b30c5154d8f641737d7c669612d06f2b0d7fe49 (diff) | |
Fix a little breakage with last commit.
| -rw-r--r-- | default.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 \ |