Page MenuHomeFreeBSD
Files F163277567

D52832.id163247.diff
No OneTemporary
Actions

D52832.id163247.diff
View Options

diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -119,11 +119,22 @@
.endif
${__group}TAG_ARGS= -T ${${__group}TAGS:ts,:[*]}
+
.endif # defined(NO_ROOT)
${__group}INSTALL?= ${INSTALL} ${${__group}TAG_ARGS} \
-o ${${__group}OWN} -g ${${__group}GRP} -m ${${__group}MODE}
+# If MANSPLITPKG is disabled, most manpages end up in the base package,
+# which is fine, but manpages in section 2 or 3 should go in the -dev
+# package instead.
+.if ${MK_MANSPLITPKG} == "no" && !defined(NO_DEV_PACKAGE)
+${__group}INSTALL_DEV?= ${INSTALL} ${${__group}TAG_ARGS:D${${__group}TAG_ARGS},dev} \
+ -o ${${__group}OWN} -g ${${__group}GRP} -m ${${__group}MODE}
+.else
+${__group}INSTALL_DEV?= ${${__group}INSTALL}
+.endif
+
.if ${MK_MANCOMPRESS} == "no"
# Make special arrangements to filter to a temporary file at build time
@@ -260,12 +271,22 @@
.if ${MK_MANCOMPRESS} == "no"
.if defined(MANFILTER)
.for __page in ${${__group}}
+.if ${__page:M*.[23]}
+ ${${__group}INSTALL_DEV} ${__page:T:S/$/${FILTEXTENSION}/g} \
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
+.else
${${__group}INSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
+.endif
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+.if ${__page:M*.[23]}
+ ${${__group}INSTALL_DEV} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
+.else
${${__group}INSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
.endif
+.endif
.endfor
.else # !defined(MANFILTER)
@set ${.ALLSRC:C/\.([^.]*)$/.\1 \1/}; \
@@ -281,19 +302,34 @@
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
.for __page in ${${__group}}
+.if ${__page:M*.[23]}
+ ${${__group}INSTALL_DEV} ${__page:T:S/$/${CATEXT}/} \
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
+.else
${${__group}INSTALL} ${__page:T:S/$/${CATEXT}/} \
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
+.endif
.endfor
.endif
.endif # defined(MANFILTER)
.else # ${MK_MANCOMPRESS} == "yes"
.for __page in ${${__group}}
+.if ${__page:M*.[23]}
+ ${${__group}INSTALL_DEV} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/
+.else
${${__group}INSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/
+.endif
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+.if ${__page:M*.[23]}
+ ${${__group}INSTALL_DEV} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
+.else
${${__group}INSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
.endif
+.endif
.endfor
.endif # ${MK_MANCOMPRESS} == "no"
.endif
@@ -302,8 +338,13 @@
.for l t in ${_MANLINKS}
# On MacOS, assume case folding FS, and don't install links from foo.x to FOO.x.
.if ${.MAKE.OS} != "Darwin" || ${l:tu} != ${t:tu}
+.if ${MK_MANSPLITPKG} == "no" && !defined(NO_DEV_PACKAGE) && ${l:M*.[23]}
+ ${INSTALL_MANLINK} ${${__group}TAG_ARGS:D${${__group}TAG_ARGS},dev} \
+ ${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT}
+.else
${INSTALL_MANLINK} ${${__group}TAG_ARGS} ${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT}
.endif
+.endif
.endfor
manlint: .PHONY checkmanlinks

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 4:21 PM (13 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35371875
Default Alt Text
D52832.id163247.diff (3 KB)

Event Timeline