summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-09-15 16:14:16 +0000
committerjmmv <jmmv>2003-09-15 16:14:16 +0000
commit10da16fd69c820306d8b0d21d3e9af1e0ca532c4 (patch)
tree461c354a28c260dd4bcd8070295c134a8e077d7f /mk
parent4199ccb670046aa887398b1adf5facdd2e8cbabf (diff)
downloadpkgsrc-10da16fd69c820306d8b0d21d3e9af1e0ca532c4.tar.gz
Do not rely on MANINSTALL beeing set (it's always set now) to do manpage
automatic handling. Fixes part of PR pkg/22562 by reed@reedmedia.net.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 2f1c2a6ba95..42fe12edb95 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1285 2003/09/15 10:27:12 dmcmahill Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1286 2003/09/15 16:14:16 jmmv Exp $
#
# This file is in the public domain.
#
@@ -4762,7 +4762,6 @@ _MANZ_NAWK_CMD= ${AWK} '/^([^\/]*\/)*man\/([^\/]*\/)?man[1-9ln]\/.*[1-9ln]\.gz$$
. endif # MANZ
.endif
-.if defined(MANINSTALL)
_MANINSTALL_CMD= ${AWK} 'BEGIN{ \
start="^([^\/]*\/)*man\/([^\/]*\/)?"; \
end="[1-9ln]"; } \
@@ -4771,9 +4770,6 @@ _MANINSTALL_CMD= ${AWK} 'BEGIN{ \
if (!"${MANINSTALL:Mcatinstall}" && \
match($$0, start "cat" end)) {next;} \
print $$0; }' |
-.else
-_MANINSTALL_CMD=
-.endif
.if defined(USE_IMAKE) && ${_PREFORMATTED_MAN_DIR} == "man"
_IMAKE_MAN_CMD= ${AWK} '/^([^\/]*\/)*man\/([^\/]*\/)?cat[1-9ln]\/.*0(\.gz)?$$/ { \