Fix Moblab script installation paths Cannot expect the paths to have slashes. Also standardizing brackets in Makefiles BUG=b:302363885 TEST=built image locally and seeing the scripts in expected places Change-Id: Ibc8b1718fbd1be66f8b79a0cb811c6f211951201 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/moblab/+/4973994 Commit-Queue: Varun Thammineni <varunth@google.com> Reviewed-by: Varun Thammineni <varunth@google.com> Tested-by: Varun Thammineni <varunth@google.com> Auto-Submit: Michal Matyjek <mmatyjek@google.com> Tested-by: Michal Matyjek <mmatyjek@google.com>
diff --git a/os-dependent/chromeos/Makefile b/os-dependent/chromeos/Makefile index f93a018..7d7c462 100644 --- a/os-dependent/chromeos/Makefile +++ b/os-dependent/chromeos/Makefile
@@ -31,10 +31,10 @@ ${PROTO} install: - @mkdir -p $(DESTDIR)usr/bin - install $(TMPDIR)/reset_usb ${DESTDIR}usr/bin - install -t ${DESTDIR}etc/moblab/host_server -D ${PROTO_OUT_DIR}/* - install -D host_server_chromeos.py ${DESTDIR}etc/moblab/host_server - install -D ../common/host*.py ${DESTDIR}etc/moblab/host_server - @mkdir -p ${DESTDIR}etc/moblab/host_server/utils - install -D ../common/utils/*.py ${DESTDIR}etc/moblab/host_server/utils + @mkdir -p $(DESTDIR)/usr/bin + install $(TMPDIR)/reset_usb $(DESTDIR)/usr/bin + install -t $(DESTDIR)/etc/moblab/host_server -D ${PROTO_OUT_DIR}/* + install -D host_server_chromeos.py $(DESTDIR)/etc/moblab/host_server + install -D ../common/host*.py $(DESTDIR)/etc/moblab/host_server + @mkdir -p $(DESTDIR)/etc/moblab/host_server/utils + install -D ../common/utils/*.py $(DESTDIR)/etc/moblab/host_server/utils
diff --git a/os-dependent/chromeos/upstart-scripts/Makefile b/os-dependent/chromeos/upstart-scripts/Makefile index 00385bb..87f46a7 100644 --- a/os-dependent/chromeos/upstart-scripts/Makefile +++ b/os-dependent/chromeos/upstart-scripts/Makefile
@@ -5,4 +5,4 @@ all: install: - install -m 0644 -t ${DESTDIR}etc/init -D *.conf + install -m 0644 -t $(DESTDIR)/etc/init -D *.conf
diff --git a/src/tools/Makefile b/src/tools/Makefile index 63f2ec4..7aba337 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile
@@ -5,5 +5,5 @@ all: install: - install -t ${DESTDIR}etc/moblab/tools/ -D *.py + install -t $(DESTDIR)/etc/moblab/tools/ -D *.py