Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F102203146
D33126.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
3 KB
Referenced Files
None
Subscribers
None
D33126.diff
View Options
diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile
--- a/share/man/man4/man4.aarch64/Makefile
+++ b/share/man/man4/man4.aarch64/Makefile
@@ -4,6 +4,17 @@
MAN= \
armv8crypto.4 \
+ enetc.4 \
+ felix.4 \
+ rk_gpio.4 \
+ rk_grf.4 \
+ rk_i2c.4 \
+ rk_pinctrl.4 \
+
+# Install manpages shared with arm only if not installing manpages
+# for all architectures, otherwise arm takes care of installing them.
+.if !empty(MAN_ARCH) && ${MAN_ARCH} != "all"
+MAN+= \
aw_gpio.4 \
aw_mmc.4 \
aw_rtc.4 \
@@ -11,18 +22,13 @@
aw_spi.4 \
aw_syscon.4 \
bcm283x_pwm.4 \
- enetc.4 \
- felix.4 \
- rk_gpio.4 \
- rk_grf.4 \
- rk_i2c.4 \
- rk_pinctrl.4 \
-# Link files to the parent directory
+.endif
+
+# Link files to the architecture directory.
+_ARCH_SUBDIR=aarch64
.for _manpage in ${MAN}
-MLINKS+=${_manpage} ../${_manpage}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
.endfor
-MANSUBDIR=/aarch64
-
.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -18,11 +18,13 @@
MLINKS= imx_wdog.4 imxwdt.4
MLINKS+= mge.4 if_mge.4
-# Link files to the parent directory
+# Link files to the architecture directory
+_ARCH_SUBDIR=arm
+.for _manpage _link in ${MLINKS}
+MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link}
+.endfor
.for _manpage in ${MAN}
-MLINKS+=${_manpage} ../${_manpage}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
.endfor
-MANSUBDIR=/arm
-
.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -21,11 +21,13 @@
MLINKS+=pae.4 PAE.4
MLINKS+=sbni.4 if_sbni.4
-# Link files to the parent directory
+# Link files to the architecture directory
+_ARCH_SUBDIR=i386
+.for _manpage _link in ${MLINKS}
+MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link}
+.endfor
.for _manpage in ${MAN}
-MLINKS+=${_manpage} ../${_manpage}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
.endfor
-MANSUBDIR=/i386
-
.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile
--- a/share/man/man4/man4.powerpc/Makefile
+++ b/share/man/man4/man4.powerpc/Makefile
@@ -15,11 +15,13 @@
snd_davbus.4 \
tsec.4
-# Link files to the parent directory
+# Link files to the architecture directory
+_ARCH_SUBDIR=powerpc
+.for _manpage _link in ${MLINKS}
+MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link}
+.endfor
.for _manpage in ${MAN}
-MLINKS+=${_manpage} ../${_manpage}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
.endfor
-MANSUBDIR=/powerpc
-
.include <bsd.prog.mk>
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64
--- a/usr.sbin/Makefile.amd64
+++ b/usr.sbin/Makefile.amd64
@@ -2,11 +2,16 @@
# mptable: broken (not 64 bit clean)
# pnpinfo: crashes (not really useful anyway)
+_ARCH_SUBDIR=amd64
.if ${MK_ACPI} != "no"
SUBDIR+= acpi
.endif
.if ${MK_APM} != "no"
SUBDIR+= apm
+# Link files to the architecture directory
+.for _manpage in ${:!/bin/sh -c "/bin/ls ${_ARCH_SUBDIR}/.8"!:E}
+MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage}
+.endfor
.endif
.if ${MK_BHYVE} != "no"
SUBDIR+= bhyve
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -5,10 +5,6 @@
MLINKS= apm.8 apmconf.8
MANSUBDIR= /${MACHINE_CPUARCH}
-# Link files to the parent directory
-MLINKS+= apm.8 ../apm.8
-MLINKS+= apmconf.8 ../apmconf.8
-
PACKAGE=apm
.include <bsd.prog.mk>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 9, 10:09 PM (19 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14566438
Default Alt Text
D33126.diff (3 KB)
Attached To
Mode
D33126: Fix build with -DNO_ROOT
Attached
Detach File
Event Timeline
Log In to Comment