diff options
| author | En-Shuo Hsu <enshuo@chromium.org> | 2019-12-21 15:35:37 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-21 18:37:47 +0000 |
| commit | 8a61d2f49e662d99e034daedc54309a5ed5c76bd (patch) | |
| tree | 6e1d71f1866b84384e56a31ab7d0ef26d4702173 /Makefile | |
| parent | 754335ec770b91b2a552a0dc8b4fc6b64c4fc11a (diff) | |
| download | adhd-8a61d2f49e662d99e034daedc54309a5ed5c76bd.tar.gz | |
CRAS: Add '/' after the use of DESTDIR
After CL:1933941 upgraded ADHD to EAPI7, the behavior of ${D} seems to change
that it won't add '/' after the return value, which causes the makefile install
the cras-script to a path like:
"/tmp/portage/media-sound/adhd-9999/imageusr/bin/" while the emerge and fail
the installation of these scripts.
This eventually fails our tests that require the audio_diagnostics.
BUG=chromium:1036430
TEST=emerge adhd and verify the audio_diagnostics is under /usr/bin
Change-Id: I864f4aebba3769e508bb5bcbb10a5d439288f049
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/1978205
Tested-by: En-Shuo Hsu <enshuo@chromium.org>
Commit-Queue: Fletcher Woodruff <fletcherw@chromium.org>
Reviewed-by: Fletcher Woodruff <fletcherw@chromium.org>
Auto-Submit: En-Shuo Hsu <enshuo@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -15,11 +15,11 @@ cras_install: cras-scripts: $(ECHO) "Installing cras scripts" - $(INSTALL) --mode 755 -d $(DESTDIR)usr/bin/ + $(INSTALL) --mode 755 -d $(DESTDIR)/usr/bin/ $(INSTALL) --mode 755 -D $(ADHD_DIR)/scripts/audio_diagnostics \ - $(DESTDIR)usr/bin/ + $(DESTDIR)/usr/bin/ $(INSTALL) --mode 755 -D $(ADHD_DIR)/scripts/asoc_dapm_graph \ - $(DESTDIR)usr/bin/ + $(DESTDIR)/usr/bin/ cras_init_upstart: $(ADHD_DIR)/init/cras.conf $(ECHO) "Installing upstart file" |