[pkgsrc/trunk]: pkgsrc/mk/tools Make implementation match documentation for w...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9553b2f77aa
branches:  trunk
changeset: 493790:d9553b2f77aa
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 15 01:17:05 2005 +0000

description:
Make implementation match documentation for when a wrapper is created and
when a symlink is created.

diffstat:

 mk/tools/bsd.tools.mk |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (34 lines):

diff -r cf42ab191345 -r d9553b2f77aa mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk     Sun May 15 00:37:41 2005 +0000
+++ b/mk/tools/bsd.tools.mk     Sun May 15 01:17:05 2005 +0000
@@ -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 @@
        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;                                                             \