diff options
| author | Roy Marples <roy@marples.name> | 2008-01-09 23:47:15 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-09 23:47:15 +0000 |
| commit | 5b30c5154d8f641737d7c669612d06f2b0d7fe49 (patch) | |
| tree | 05407663de162bab964d65f47a28c26d0a4a66c6 /default.mk | |
| parent | ddf25cbcb76bccbfe28d15f1e73c637becaa54e7 (diff) | |
install correctly on NetBSD.
Diffstat (limited to 'default.mk')
| -rw-r--r-- | default.mk | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -1,21 +1,21 @@ # Common makefile settings # We shouldn't use PREFIX as we need to install into / -_LIBNAME_SH = l=`readlink /lib`; case "$$l" in /lib64|lib64) echo "lib64";; *) echo "lib";; esac -_LIBNAME != $(_LIB_SH) -LIBNAME = $(_LIBNAME)$(shell $(_LIBNAME_SH)) -RC_LIB = /$(LIBNAME)/rc +_LIBNAME_SH= l=`readlink /lib`; case "$$l" in /lib64|lib64) echo "lib64";; *) echo "lib";; esac +_LIBNAME!= ${_LIBNAME_SH} +LIBNAME= ${_LIBNAME}$(shell ${_LIBNAME_SH}) +RC_LIB= /${LIBNAME}/rc -INSTALL ?= install +INSTALL?= install -_OS_SH = u=`uname -s`; case "$${u}" in *BSD|DragonFly) echo "BSD";; *) echo "$${u}";; esac -_OS != $(_OS_SH) -OS ?= $(_OS)$(shell $(_OS_SH)) +_OS_SH= u=`uname -s`; case "$${u}" in *BSD|DragonFly) echo "BSD";; *) echo "$${u}";; esac +_OS!= ${_OS_SH} +OS?= ${_OS}$(shell ${_OS_SH}) # We store the contents of the directory for ease of use in Makefiles -_CONTENTS_SH = ls -1 | grep -v Makefile | xargs -_CONTENTS != $(_CONTENTS_SH) -CONTENTS = $(_CONTENTS)$(shell $(_CONTENTS_SH)) +_CONTENTS_SH= ls -1 | grep -v Makefile | xargs +_CONTENTS!= ${_CONTENTS_SH} +CONTENTS= ${_CONTENTS}$(shell ${_CONTENTS_SH}) # Recursive rules # Adapted from FreeBSDs bsd.subdir.mk @@ -37,28 +37,28 @@ _SUBDIR = @${_+_}for x in ${SUBDIR}; do \ done all: - $(_SUBDIR) + ${_SUBDIR} clean:: - $(_SUBDIR) + ${_SUBDIR} depend:: - $(_SUBDIR) + ${_SUBDIR} install:: - $(_SUBDIR) + ${_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 "$(INC)"; then $(INSTALL) -m 0644 $(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:: ${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 + for x in ${CONF}; do \ + if ! test -e ${DESTDIR}${DIR}/$$x; then \ + ${INSTALL} -m 0644 $$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 $$?; \ + 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 0644 $$x ${DESTDIR}${DIR} || exit $$?; \ fi; \ done |