diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-21 18:58:46 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-21 18:58:46 +0000 |
| commit | b1b0b93f533d460ad946212087ee9969b10408ad (patch) | |
| tree | 7b0da8771f3c8517ebeecc24d3d1d24c59447ca6 /Makefile.inc1 | |
| parent | 9ceae00dd0c916d852a0aeccd557cdc4b283bcc7 (diff) | |
| download | FreeBSD-src-b1b0b93f533d460ad946212087ee9969b10408ad.zip FreeBSD-src-b1b0b93f533d460ad946212087ee9969b10408ad.tar.gz | |
Fix my change in r289435 causing 'etc' to be added to SUBDIR when using
SUBDIR_OVERRIDE.
MFC after: 2 weeks
X-MFC-With: r289435
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index efe841e..368bc4f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -113,7 +113,6 @@ SUBDIR+= ${_DIR} .warning ${_DIR} not added to SUBDIR list. See UPDATING 20141121. .endif .endfor -.endif # We must do etc/ last as it hooks into building the man whatis file # by calling 'makedb' in share/man. This is only relevant for @@ -124,6 +123,8 @@ SUBDIR+=.WAIT .endif SUBDIR+=etc +.endif # defined(SUBDIR_OVERRIDE) + .if defined(NOCLEAN) NO_CLEAN= ${NOCLEAN} .endif |
