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>
diff --git a/Makefile b/Makefile
index 371ba8b..79a26e6 100644
--- a/Makefile
+++ b/Makefile
@@ -43,17 +43,17 @@
# 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 @@
${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 @@
.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