diff options
| author | cem <cem@FreeBSD.org> | 2016-02-03 01:40:07 +0000 |
|---|---|---|
| committer | cem <cem@FreeBSD.org> | 2016-02-03 01:40:07 +0000 |
| commit | d8a6a1cf148b47a295850717ae031f12d55b5741 (patch) | |
| tree | 5c044d8500c4479c875e3ef51f99e1e041cc66fc | |
| parent | d6406df83942d9fa08b4b2cf53ee2c5527172039 (diff) | |
| download | FreeBSD-src-d8a6a1cf148b47a295850717ae031f12d55b5741.zip FreeBSD-src-d8a6a1cf148b47a295850717ae031f12d55b5741.tar.gz | |
Revert r295167 at bdrewery's request
$ svn merge -c -295167 .
JHB reports Navdeep reports that it breaks distribution and etcupdate.
Approved by: bdrewery
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 001df80..222d7ec 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1087,7 +1087,9 @@ distrib-dirs: .MAKE .PHONY ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} -distribution: distrib-dirs .MAKE .PHONY +distribution: .MAKE .PHONY + ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ + ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ METALOG=${METALOG} installconfig |
