pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/doc/guide doc/guide: clean up conditions in package ma...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d1d7c0894e7
branches:  trunk
changeset: 382306:7d1d7c0894e7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jul 25 05:57:18 2022 +0000

description:
doc/guide: clean up conditions in package makefile

The condition 'defined(OUTPUT)' was always true.

Since OUTPUT is guaranteed to defined, there is no need to use the
complicated '!empty'.

No functional change.

diffstat:

 doc/guide/Makefile |  15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r bcf9c4c029d4 -r 7d1d7c0894e7 doc/guide/Makefile
--- a/doc/guide/Makefile        Mon Jul 25 05:42:22 2022 +0000
+++ b/doc/guide/Makefile        Mon Jul 25 05:57:18 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/01/04 09:16:14 leot Exp $
+# $NetBSD: Makefile,v 1.74 2022/07/25 05:57:18 rillig Exp $
 
 DISTNAME=              pkgsrc-guide-${PKGVERSION}
 CATEGORIES=            # empty
@@ -37,28 +37,25 @@
 SUBST_SED.docbook45=   -e 's,V4\.2,V4.5,'
 SUBST_SED.docbook45+=  -e 's,/4\.2/,/4.5/,'
 
-.if defined(OUTPUTS)
-.  if !empty(OUTPUTS:Mascii)
+.if ${OUTPUTS:Mascii}
 # the html is needed to build the ascii version.
 OUTPUTS+=              html
 PLIST.ascii=           yes
-.  endif
+.endif
 
-.  if !empty(OUTPUTS:Mhtml) || !empty(OUTPUTS:Mhtml-split)
+.if ${OUTPUTS:Mhtml} || ${OUTPUTS:Mhtml-split}
 PLIST.html=            yes
 .endif
 
-.  if !empty(OUTPUTS:Mpdf)
+.if ${OUTPUTS:Mpdf}
 PLIST.pdf=             yes
 .endif
 
-.  if !empty(OUTPUTS:Mepub)
+.if ${OUTPUTS:Mepub}
 PLIST.epub=            yes
 .endif
 
-# only override the Makefile.common default if it is explicitly set
 _GUIDE_OUTPUTS=                ${OUTPUTS}
-.endif
 
 .include "Makefile.common"
 



Home | Main Index | Thread Index | Old Index