diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2014-09-11 10:41:51 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-06 01:15:53 +0000 |
| commit | 5960bf4fae5d32d68e79ed1fa5d2f022599b281e (patch) | |
| tree | f118fd2b2fc57027b720b455b75fcc5f4a3bb615 | |
| parent | cfb67d342e3198e2cb932f1fda6d2b04b778d945 (diff) | |
| download | vboot-5960bf4fae5d32d68e79ed1fa5d2f022599b281e.tar.gz | |
cleanup: DESTDIR refers to the install root, not the bin/
This doesn't have any visible effect. It just brings the meaning
of the where-do-I-put-this variable more in line with common
convention.
BRANCH=ToT
BUG=none
CQ-DEPEND=CL:217940
TEST=lots...
make runtests
make DESTDIR=BAR install
make MINIMAL=1 DESTDIR=FOO install
emerge-$BOARD vboot_reference
sudo emerge vboot_reference
trybots: link-tot-paladin, daisy_spring-paladin
Change-Id: I8d72664da07535f663d8b2f13c872eece37978b9
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/217930
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/227873
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | tests/common.sh | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -43,17 +43,17 @@ export BUILD # Stuff for 'make install' INSTALL = install -DESTDIR = /usr/local/bin +DESTDIR = /usr/local # Where exactly do the pieces go? # UB_DIR = utility binary directory # VB_DIR = vboot binary directory for dev-mode-only scripts ifeq (${MINIMAL},) # Host install just puts everything where it's told -UB_DIR=${DESTDIR} -VB_DIR=${DESTDIR} +UB_DIR=${DESTDIR}/bin +VB_DIR=${DESTDIR}/bin else -# Target install puts things into subdirectories under DESTDIR +# Target install puts things into different places UB_DIR=${DESTDIR}/usr/bin VB_DIR=${DESTDIR}/usr/share/vboot/bin endif @@ -897,7 +897,7 @@ ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} .PHONY: futil_install -futil_install: ${FUTIL_BIN} +futil_install: ${FUTIL_BIN} ${FUTIL_STATIC_BIN} @$(PRINTF) " INSTALL futility\n" ${Q}mkdir -p ${UB_DIR} ${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN} ${FUTIL_STATIC_BIN} @@ -1173,7 +1173,7 @@ run2tests: test_setup .PHONY: runfutiltests runfutiltests: test_setup - tests/futility/run_test_scripts.sh ${TEST_INSTALL_DIR} + tests/futility/run_test_scripts.sh ${TEST_INSTALL_DIR}/bin ${RUNTEST} ${BUILD_RUN}/tests/futility/test_not_really # Run long tests, including all permutations of encryption keys (instead of @@ -65,7 +65,7 @@ The commands are the more-or-less expected ones: make make runtests - make install [ DESTDIR=/usr/local/bin ] + make install [ DESTDIR=/usr/local ] diff --git a/tests/common.sh b/tests/common.sh index 5a963436..2b017cc5 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -9,7 +9,7 @@ SCRIPT_DIR=$(dirname $(readlink -f "$0")) ROOT_DIR="$(dirname ${SCRIPT_DIR})" BUILD_DIR="${BUILD}" -BIN_DIR="${BUILD_DIR}/install_for_test" +BIN_DIR=${BUILD_DIR}/install_for_test/bin FUTILITY=${BIN_DIR}/futility TEST_DIR="${BUILD_DIR}/tests" TESTKEY_DIR=${SCRIPT_DIR}/testkeys |