Date: Fri, 19 Jun 2015 05:42:25 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284590 - in head/sys/boot: . common i386/loader Message-ID: <201506190542.t5J5gPeY007771@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jun 19 05:42:24 2015 New Revision: 284590 URL: https://svnweb.freebsd.org/changeset/base/284590 Log: Install loader(8) and zfsloader(8) only once Differential Revision: https://reviews.freebsd.org/D2841 Reviewed by: imp Added: head/sys/boot/common/Makefile (contents, props changed) Modified: head/sys/boot/Makefile head/sys/boot/common/Makefile.inc head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/Makefile ============================================================================== --- head/sys/boot/Makefile Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -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. Added: head/sys/boot/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/boot/common/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include <src.opts.mk> + +MAN+= loader.8 +.if ${MK_ZFS} != "no" +MAN+= zfsloader.8 +.endif + +.include <bsd.prog.mk> Modified: head/sys/boot/common/Makefile.inc ============================================================================== --- head/sys/boot/common/Makefile.inc Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/common/Makefile.inc Fri Jun 19 05:42:24 2015 (r284590) @@ -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 Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Fri Jun 19 05:09:02 2015 (r284589) +++ head/sys/boot/i386/loader/Makefile Fri Jun 19 05:42:24 2015 (r284590) @@ -5,6 +5,7 @@ MK_SSP= no LOADER?= loader PROG= ${LOADER}.sym +MAN= INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506190542.t5J5gPeY007771>