[src/trunk]: src/share/mk Since the libraries are produced with different MK ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc4c5b4a2f46
branches:  trunk
changeset: 784920:dc4c5b4a2f46
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 14 03:02:47 2013 +0000

description:
Since the libraries are produced with different MK flags than the programs,
we check for existance of the files instead of the MK flags.

diffstat:

 share/mk/bsd.prog.mk |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (34 lines):

diff -r fc0dbc84a5e1 -r dc4c5b4a2f46 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Thu Feb 14 02:52:59 2013 +0000
+++ b/share/mk/bsd.prog.mk      Thu Feb 14 03:02:47 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.281 2013/02/14 01:58:00 christos Exp $
+#      $NetBSD: bsd.prog.mk,v 1.282 2013/02/14 03:02:47 christos Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -381,16 +381,16 @@
 .if defined(PROGDPLIBS)                                                # {
 .for _lib _dir in ${PROGDPLIBS}
 .if !defined(BINDO.${_lib})
-BINDO.${_lib}!=        cd "${_dir}" && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=BINDO.${_lib}
+PROGDO.${_lib}!=       cd "${_dir}" && ${PRINTOBJDIR}
+.MAKEOVERRIDES+=PROGDO.${_lib}
 .endif
-LDADD+=                -L${BINDO.${_lib}} -l${_lib}
-.if ${MKPICLIB} != "no"
-DPADD+=                ${BINDO.${_lib}}/libamu_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${BINDO.${_lib}}/libamu.so
+LDADD+=                -L${PROGDO.${_lib}} -l${_lib}
+.if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
+DPADD+=                ${PROGDO.${_lib}}/lib${_lib}_pic.a
+.elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
+DPADD+=                ${PROGDO.${_lib}}/lib${_lib}.so
 .else
-DPADD+=                ${BINDO.${_lib}}/libamu.a
+DPADD+=                ${PROGDO.${_lib}}/lib${_lib}.a
 .endif
 .endfor
 .endif                                                                 # }