[src/netbsd-1-4]: src/share/mk Apply revision 1.173 (via patch, requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/b7e7fe4a4ffb
branches:  netbsd-1-4
changeset: 470847:b7e7fe4a4ffb
user:      he <he%NetBSD.org@localhost>
date:      Mon Aug 14 14:04:12 2000 +0000

description:
Apply revision 1.173 (via patch, requested by he):
  Make shared library support work if shlib_version file is missing.
  Fixes PR#10556.

diffstat:

 share/mk/bsd.lib.mk |  23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r d7a7c8705b0b -r b7e7fe4a4ffb share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Wed Aug 09 18:07:45 2000 +0000
+++ b/share/mk/bsd.lib.mk       Mon Aug 14 14:04:12 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.152.2.3 2000/07/06 16:54:37 he Exp $
+#      $NetBSD: bsd.lib.mk,v 1.152.2.4 2000/08/14 14:04:12 he Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -19,11 +19,6 @@
 SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
 SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
 SHLIB_TEENY != . ${.CURDIR}/shlib_version ; echo $$teeny
-.if !empty(SHLIB_TEENY)
-SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
-.else
-SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
 
 # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
@@ -31,11 +26,23 @@
 checkver:
        @(cd ${.CURDIR} && \
                ${BSDSRCDIR}/lib/checkver -d ${DESTDIR}${LIBDIR} ${LIB})
-.else
+.endif
+.endif
+
+.if !target(checkver)
 checkver:
 .endif
+
+.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR)
+.if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR)
+.if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY)
+SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
 .else
-checkver:
+SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
+.endif
+.else
+SHLIB_FULLVERSION=${SHLIB_MAJOR}
+.endif
 .endif
 
 # add additional suffixes not exported.