a few OptionalObsoleteFiles.inc improvements

b. f. bf1783 at googlemail.com
Tue Dec 14 05:12:37 UTC 2010


Alexander Best wrote:

>any thoughts on this patch? it adds files which will be removed when
>WITHOUT_SYSCONS is set. also it makes sure sysinstall(8) and sade(8) only get
>installed when WITHOUT_SYSINSTALL wasn't defined and also that any related
>executables and manual pages get removed if in fact that var is defined.

...

>diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
>index f3e853e..2151868 100644
>--- a/usr.sbin/Makefile
>+++ b/usr.sbin/Makefile
>@@ -250,7 +250,6 @@ SUBDIR+=    ftp-proxy
> SUBDIR+=       pkg_install
> .endif
>
>-# XXX MK_TOOLCHAIN?
> .if ${MK_PMC} != "no"
> SUBDIR+=       pmcannotate
> SUBDIR+=       pmccontrol
>@@ -283,7 +282,9 @@ SUBDIR+=    praliases
> SUBDIR+=       sendmail
> .endif
 >
>+.if ${MK_SYSINSTALL} != "no"
> SUBDIR+=       sysinstall
>+.endif

I'm glad to see that you're filling in some of the many missing bits
in this file.

The last part of your patch reverts a change that Warner Losh made in
r212525 as part of his tbemd project merge.  It's possible that this
change may have been an unintended, but it followed a discussion in
which Warner rejected a related patch proposed by Garrett Cooper,
partly because sysinstall is included in build-tools in Makefile.inc1,
even though some thought that it should not be.  In any event, you
should probably look into that before committing the last part of your
patch.

b.


More information about the freebsd-current mailing list