[src/trunk]: src/share/mk Rearrange slightly to get rid of unneeded condition...

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

details:   https://anonhg.NetBSD.org/src/rev/95b78d0fe9e5
branches:  trunk
changeset: 487460:95b78d0fe9e5
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Jun 08 03:51:56 2000 +0000

description:
Rearrange slightly to get rid of unneeded conditionals (and make this
*slightly* less painful to trace through, though not much).

diffstat:

 share/mk/bsd.info.mk |   6 ++----
 share/mk/bsd.nls.mk  |  24 +++++-------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diffs (80 lines):

diff -r 0c5cc0fca2d4 -r 95b78d0fe9e5 share/mk/bsd.info.mk
--- a/share/mk/bsd.info.mk      Thu Jun 08 03:30:58 2000 +0000
+++ b/share/mk/bsd.info.mk      Thu Jun 08 03:51:56 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.info.mk,v 1.15 2000/06/08 03:30:58 mycroft Exp $
+#      $NetBSD: bsd.info.mk,v 1.16 2000/06/08 03:51:56 mycroft Exp $
 
 .if !target(__initialized__)
 __initialized__:
@@ -16,9 +16,6 @@
 INSTALL_INFO?= install-info
 
 .PHONY:                infoinstall cleaninfo
-.if ${MKINFO} != "no"
-realinstall:   infoinstall
-.endif
 cleandir distclean: cleaninfo
 
 .SUFFIXES: .txi .texi .texinfo .info
@@ -31,6 +28,7 @@
 .NOPATH:       ${INFOFILES}
 
 .if ${MKINFO} != "no"
+realinstall: infoinstall
 realall: ${INFOFILES}
 .endif
 
diff -r 0c5cc0fca2d4 -r 95b78d0fe9e5 share/mk/bsd.nls.mk
--- a/share/mk/bsd.nls.mk       Thu Jun 08 03:30:58 2000 +0000
+++ b/share/mk/bsd.nls.mk       Thu Jun 08 03:51:56 2000 +0000
@@ -1,17 +1,14 @@
-#      $NetBSD: bsd.nls.mk,v 1.25 2000/06/07 17:28:52 matt Exp $
+#      $NetBSD: bsd.nls.mk,v 1.26 2000/06/08 03:51:56 mycroft Exp $
 
 .if !target(__initialized__)
 __initialized__:
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-
 .MAIN:         all
 .endif
+
 .PHONY:                cleannls nlsinstall
-.if ${MKNLS} != "no"
-realinstall:   nlsinstall
-.endif
 cleandir distclean: cleannls
 
 .SUFFIXES: .cat .msg
@@ -23,18 +20,11 @@
 .if defined(NLS) && !empty(NLS)
 NLSALL= ${NLS:.msg=.cat}
 .NOPATH: ${NLSALL}
-.endif
+
+NLSNAME?=${PROG:Ulib${LIB}}
 
-.if !defined(NLSNAME)
-.if defined(PROG)
-NLSNAME=${PROG}
-.else
-NLSNAME=lib${LIB}
-.endif
-.endif
-
-.if defined(NLSALL)
 .if ${MKNLS} != "no"
+realinstall: nlsinstall
 realall: ${NLSALL}
 .endif
 
@@ -73,7 +63,3 @@
 .else
 cleannls:
 .endif
-
-.if !target(nlsinstall)
-nlsinstall::
-.endif