diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-15 01:17:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-15 01:17:05 +0000 |
| commit | 2f3b9ec6f2c0c1e0671b09230282bc4447fb41b3 (patch) | |
| tree | f4ba278d99bec5126cccb7a1c2a14652516a4366 | |
| parent | 8c15e22cb1c8f8b05a1df21d64864140c35c7ebc (diff) | |
| download | pkgsrc-2f3b9ec6f2c0c1e0671b09230282bc4447fb41b3.tar.gz | |
Make implementation match documentation for when a wrapper is created and
when a symlink is created.
| -rw-r--r-- | mk/tools/bsd.tools.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index 79ce3932faa..b28127cf358 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.20 2005/05/11 08:41:50 jlam Exp $ +# $NetBSD: bsd.tools.mk,v 1.21 2005/05/15 01:17:05 jlam Exp $ # # This Makefile fragment creates tools under ${TOOLS_DIR} that are # found before similarly-named tools in the system path. @@ -144,14 +144,17 @@ ${TOOLS_CMD.${_t_}}: if ${TEST} -n ${TOOLS_REAL_CMDLINE.${_t_}:Q}""; then \ create=wrapper; \ cmdline=${TOOLS_REAL_CMDLINE.${_t_}:Q}; \ - elif ${TEST} -n ${TOOLS_REAL_CMD.${_t_}:Q}"" -a \ - -z ${TOOLS_ARGS.${_t_}:Q}""; then \ - case ${TOOLS_REAL_CMD.${_t_}:Q}"" in \ - /*) create=symlink ;; \ - *) create=wrapper; \ + elif ${TEST} -n ${TOOLS_REAL_CMD.${_t_}:Q}""; then \ + if ${TEST} -n ${TOOLS_REAL_ARGS.${_t_}:Q}""; then \ + create=wrapper; \ cmdline=${_TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \ - ;; \ - esac; \ + else \ + case ${TOOLS_REAL_CMD.${_t_}:Q}"" in \ + /*) create=symlink ;; \ + *) create=wrapper; \ + cmdline=${_TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \ + esac; \ + fi; \ else \ create=symlink; \ fi; \ |