X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=bcaab9293e701a993f43931e818c0b9e2327906d;hb=49497b5b1e2a40ae9fac8bd43ecdfeed4d00e248;hp=3bcf34ef693051d7cf10f06819128b391a2aace7;hpb=4f8e078afa1e8152789bf8009bcf6f794bda18cc;p=src%2Fxds%2Fxds-server.git diff --git a/Makefile b/Makefile index 3bcf34e..bcaab92 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ ifeq ($(origin INSTALL_DIR), undefined) INSTALL_DIR := /usr/local/bin endif ifeq ($(origin INSTALL_WEBAPP_DIR), undefined) - INSTALL_WEBAPP_DIR := $(INSTALL_DIR)/xds-server-www + INSTALL_WEBAPP_DIR := $(INSTALL_DIR)/www-xds-server endif HOST_GOOS=$(shell go env GOOS) @@ -95,7 +95,7 @@ install: @test -e $(LOCAL_BINDIR)/xds-start-server.sh -a -d $(LOCAL_BINDIR)/agl || { echo "Please execute first: make all\n"; exit 1; } @test -e $(LOCAL_BINDIR)/syncthing -a -e $(LOCAL_BINDIR)/syncthing-inotify || { echo "Please execute first: make all\n"; exit 1; } mkdir -p $(INSTALL_DIR) \ - && cp -a $(LOCAL_BINDIR)/* $(INSTALL_DIR) \ + && cp -a $(LOCAL_BINDIR)/* $(INSTALL_DIR) mkdir -p $(INSTALL_WEBAPP_DIR) \ && cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR) @@ -110,6 +110,7 @@ tools/glide: .PHONY: tools/syncthing tools/syncthing: @test -e $(LOCAL_TOOLSDIR)/syncthing -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify || { \ + mkdir -p $(LOCAL_TOOLSDIR); \ DESTDIR=$(LOCAL_TOOLSDIR) \ SYNCTHING_VERSION=$(SYNCTHING_VERSION) \ SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \