summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/install/install.mk4
-rw-r--r--mk/plist/plist-man.awk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 5691face206..50cc46d9917 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.68 2016/04/10 15:58:02 joerg Exp $
+# $NetBSD: install.mk,v 1.69 2016/07/26 08:41:36 jperkin Exp $
#
# This file provides the code for the "install" phase.
#
@@ -342,7 +342,7 @@ install-strip-debug: plist
_PLIST_REGEXP.info= \
^([^\/]*\/)*${PKGINFODIR}/[^/]*(\.info)?(-[0-9]+)?(\.gz)?$$
_PLIST_REGEXP.man= \
- ^([^/]*/)+(man[1-9ln](am|f)?/[^/]*\.[1-9ln](am|f)?|cat[1-9ln](am|f)?/[^/]*\.[0-9])(\.gz)?$$
+ ^([^/]*/)+((man|html)[1-9ln](am|f)?/[^/]*\.([1-9ln](am|f)?|html)|cat[1-9ln](am|f)?/[^/]*\.[0-9])(\.gz)?$$
_DOC_COMPRESS= \
${PKGSRC_SETENV} PATH=${PATH:Q} \
diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk
index 8dcd366bb6b..4cdab56a559 100644
--- a/mk/plist/plist-man.awk
+++ b/mk/plist/plist-man.awk
@@ -1,4 +1,4 @@
-# $NetBSD: plist-man.awk,v 1.11 2016/04/11 12:29:53 jperkin Exp $
+# $NetBSD: plist-man.awk,v 1.12 2016/07/26 08:41:36 jperkin Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -77,7 +77,7 @@ BEGIN {
PKGMANDIR = getenv("PKGMANDIR", "man")
CATMAN_SECTION_SUFFIX = getenv("CATMAN_SECTION_SUFFIX", "no")
CATPAGE_REGEX = "cat[1-9ln](am|f)?/[^/]*\\.[0-9ln](am|f)?"
- MANPAGE_REGEX = "man[1-9ln](am|f)?/[^/]*\\.[1-9ln](am|f)?"
+ MANPAGE_REGEX = "(man|html)[1-9ln](am|f)?/[^/]*\\.([1-9ln](am|f)?|html)"
CATORMAN_REGEX = "(" MANPAGE_REGEX "|" CATPAGE_REGEX ")"
}