diff options
| author | gjb <gjb@FreeBSD.org> | 2016-05-26 21:08:44 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-05-26 21:08:44 +0000 |
| commit | 215d3953b78b88237fcbfdc60d0dbc4b3e23bf60 (patch) | |
| tree | 63c731eb12f5c65d587f800474d9dfec8f1a533b | |
| parent | 284a864941420a45c138e68a75dd73ba8c3ebd34 (diff) | |
| download | FreeBSD-src-215d3953b78b88237fcbfdc60d0dbc4b3e23bf60.zip FreeBSD-src-215d3953b78b88237fcbfdc60d0dbc4b3e23bf60.tar.gz | |
Remove vestigial cloudware-install bits missed in r300767.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | release/Makefile | 2 | ||||
| -rw-r--r-- | release/Makefile.vm | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile index a8efa2c..60a86c7 100644 --- a/release/Makefile +++ b/release/Makefile @@ -291,7 +291,7 @@ real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -install: release-install vm-install cloudware-install +install: release-install vm-install release-install: .if defined(DESTDIR) && !empty(DESTDIR) diff --git a/release/Makefile.vm b/release/Makefile.vm index 24c8dea..9de3846 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -46,7 +46,6 @@ CLEANFILES+= ${_CW:tl}.img \ ${_CW:tl}.${${_CW:tu}_FORMAT} \ ${_CW:tl}.${${_CW:tu}_FORMAT}.raw \ cw${_CW:tl}-package -CLOUDINSTALL+= cw${_CW:tl}-install CLOUDPACKAGE+= cw${_CW:tl}-package ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} . if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF) @@ -145,11 +144,6 @@ cloudware-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS} .endif -cloudware-install: -.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDINSTALL} -.endif - .include "${.CURDIR}/Makefile.ec2" .include "${.CURDIR}/Makefile.azure" .include "${.CURDIR}/Makefile.gce" |
