diff options
| author | jmc <jmc> | 2003-04-11 18:13:09 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-04-11 18:13:09 +0000 |
| commit | 6e387917f18170626fba9f306aa7e54361f9b3fc (patch) | |
| tree | 1348f2d42c20cd165bd4d0370938d46e807abac7 /mk/buildlink2 | |
| parent | ca47c772ef50277c6860cc190c75d870a914d47a (diff) | |
| download | pkgsrc-6e387917f18170626fba9f306aa7e54361f9b3fc.tar.gz | |
Make sure wrappee is actually a file/link before considering it found.
On solaris for instance if one put /usr/lib in their path before /usr/ccs/bin
it would match /usr/lib/ld rather than /usr/ccs/bin/ld except that
/usr/lib/ld is a directory...
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 41486cc8b7f..f0bc8c089df 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.79 2003/01/25 07:57:21 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.80 2003/04/11 18:13:09 jmc Exp $ # # An example package buildlink2.mk file: # @@ -729,7 +729,9 @@ ${BUILDLINK_${_wrappee_}}: \ case $${dir} in \ *${BUILDLINK_DIR}*) \ ;; \ - *) if [ -x $${dir}/$${wrappee} ]; then \ + *) if [ -f $${dir}/$${wrappee} ] || \ + [ -h $${dir}/$${wrappee} ] && \ + [ -x $${dir}/$${wrappee} ]; then \ absdir=$${dir}/; \ wrappee=$${absdir}$${wrappee}; \ break; \ |