diff options
| author | Owen Lin <owenlin@chromium.org> | 2014-01-06 18:51:19 +0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-07 04:52:54 +0000 |
| commit | 529b8517ca92afe17f6f83742b7abba8e685c522 (patch) | |
| tree | e88aa8c5cd5df71f9094c681d41be323716ae6cf /Makefile | |
| parent | 9108fb3926660c3a85b6b69779103b2d97cf6571 (diff) | |
| download | adhd-529b8517ca92afe17f6f83742b7abba8e685c522.tar.gz | |
Makefile - Install cras-scripts on all platforms.
The scripts are not available on mario and alex because there is no cras config
for these boards. I don't think they are related and we should install the
scripts on all platforms.
BUG=None
TEST=Run emerge-x86-mario adhd
Change-Id: I04f18242a3e2274c54fb5ece76997043644606ca
Reviewed-on: https://chromium-review.googlesource.com/181589
Reviewed-by: Chih-Chung Chang <chihchung@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Owen Lin <owenlin@chromium.org>
Tested-by: Owen Lin <owenlin@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -16,6 +16,12 @@ cras: cras_install: @$(call remake,Building,cras,cras.mk,$@) +cras-scripts: + $(ECHO) "Installing cras scripts" + $(INSTALL) --mode 755 -d $(DESTDIR)usr/bin/ + $(INSTALL) --mode 755 -D $(ADHD_DIR)/scripts/audio_diagnostics \ + $(DESTDIR)usr/bin/ + $(DESTDIR)/etc/init/cras.conf: $(ADHD_DIR)/upstart/cras.conf $(ECHO) "Installing '$<' to '$@'" $(INSTALL) --mode 644 -D $< $@ @@ -64,27 +70,22 @@ optional_cras_conf := $(wildcard $(ADHD_DIR)/cras-config/$(BOARD)/*) ifneq ($(strip $(optional_cras_conf)),) -.PHONY: cras-config-files cras-scripts +.PHONY: cras-config-files cras-config-files: $(ECHO) "Installing cras config files" $(INSTALL) --mode 755 -d $(DESTDIR)etc/cras/ $(INSTALL) --mode 644 -D $(ADHD_DIR)/cras-config/$(BOARD)/* $(DESTDIR)etc/cras/ -cras-scripts: - $(ECHO) "Installing cras scripts" - $(INSTALL) --mode 755 -d $(DESTDIR)usr/bin/ - $(INSTALL) --mode 755 -D $(ADHD_DIR)/scripts/audio_diagnostics \ - $(DESTDIR)usr/bin/ - -install: cras-config-files cras-scripts +install: cras-config-files endif install: $(DESTDIR)/etc/init/cras.conf \ $(DESTDIR)/etc/asound.state \ $(DESTDIR)/etc/cras/device_blacklist \ + cras-scripts \ cras_install clean: @rm -rf $(ADHD_BUILD_DIR) -.PHONY: clean cras cras_install +.PHONY: clean cras cras_install cras-script |