diff options
| author | bapt <bapt@FreeBSD.org> | 2015-06-19 05:42:24 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-06-19 05:42:24 +0000 |
| commit | 5fb18cce439ebe6d671bec86997a443a7284437d (patch) | |
| tree | c17ee96411ea6175be781d65e588e8b923747a78 /sys/boot | |
| parent | 82671124eea59e64041ba4e91e97f61d7ee1b320 (diff) | |
| download | FreeBSD-src-5fb18cce439ebe6d671bec86997a443a7284437d.zip FreeBSD-src-5fb18cce439ebe6d671bec86997a443a7284437d.tar.gz | |
Install loader(8) and zfsloader(8) only once
Differential Revision: https://reviews.freebsd.org/D2841
Reviewed by: imp
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/common/Makefile | 10 | ||||
| -rw-r--r-- | sys/boot/common/Makefile.inc | 5 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile index 2aa76b7..2607651 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -8,6 +8,8 @@ SUBDIR+= ficl SUBDIR+= forth .endif +SUBDIR+= common + .include <bsd.arch.inc.mk> # Pick the machine-dependent subdir based on the target architecture. diff --git a/sys/boot/common/Makefile b/sys/boot/common/Makefile new file mode 100644 index 0000000..fcca328 --- /dev/null +++ b/sys/boot/common/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include <src.opts.mk> + +MAN+= loader.8 +.if ${MK_ZFS} != "no" +MAN+= zfsloader.8 +.endif + +.include <bsd.prog.mk> diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc index 54e8617..d647fe3 100644 --- a/sys/boot/common/Makefile.inc +++ b/sys/boot/common/Makefile.inc @@ -68,8 +68,3 @@ CFLAGS+= -DBOOT_PROMPT_123 SRCS+= install.c CFLAGS+=-I${.CURDIR}/../../../../lib/libstand .endif - -MAN+= loader.8 -.if ${MK_ZFS} != "no" -MAN+= zfsloader.8 -.endif diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 6e735a4..ade6054 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -5,6 +5,7 @@ MK_SSP= no LOADER?= loader PROG= ${LOADER}.sym +MAN= INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86 |
