diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-11 06:57:20 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-11 06:57:20 +0000 |
| commit | b7391dae4ae82148a179e853c782b7da6f441b70 (patch) | |
| tree | 7fe6c7713007ae7e7d09e79bb3e6c5a725729d69 | |
| parent | 8eb333920f0dab3cea27c1e6f71a65b6554f016e (diff) | |
| download | FreeBSD-src-b7391dae4ae82148a179e853c782b7da6f441b70.zip FreeBSD-src-b7391dae4ae82148a179e853c782b7da6f441b70.tar.gz | |
MFC r277663:
r277663:
Add MK_EE knob to control installing edit, ee, etc
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 17 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_EE | 5 | ||||
| -rw-r--r-- | usr.bin/Makefile | 5 |
4 files changed, 27 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index f043cab..e55057e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -272,6 +272,7 @@ __DEFAULT_YES_OPTIONS = \ DICT \ DYNAMICROOT \ ED_CRYPTO \ + EE \ EXAMPLES \ FLOPPY \ FMTREE \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 72acf9c..2cc23cb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1252,6 +1252,23 @@ OLD_FILES+=usr/share/dict/web2a OLD_FILES+=usr/share/dict/words .endif +.if ${MK_EE} == no +OLD_FILES+=usr/bin/edit +OLD_FILES+=usr/bin/ee +OLD_FILES+=usr/bin/ree +OLD_FILES+=usr/share/man/man1/edit.1.gz +OLD_FILES+=usr/share/man/man1/ee.1.gz +OLD_FILES+=usr/share/man/man1/ree.1.gz +OLD_FILES+=usr/share/nls/C/ee.cat +OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat +OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat +OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat +OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat +.endif + #.if ${MK_EXAMPLES} == no # to be filled in #.endif diff --git a/tools/build/options/WITHOUT_EE b/tools/build/options/WITHOUT_EE new file mode 100644 index 0000000..721ddaa --- /dev/null +++ b/tools/build/options/WITHOUT_EE @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build and install +.Xr edit 1 , +.Xr ee 1 , +and related programs. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 12855e1..224f3e7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -38,7 +38,6 @@ SUBDIR= alias \ dirname \ dpv \ du \ - ee \ elf2aout \ elfdump \ enigma \ @@ -232,6 +231,10 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_EE} != "no" +SUBDIR+= ee +.endif + .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif |
