X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=eb70258e3c0a6abd49826358f23a8e8a9788dd5a;hb=fa1a0fa5e47260349d2da761b499223d11324b58;hp=ae5a69c2bf6304b866d803e4dfc769f399b0817b;hpb=777204d72f9d184e4416f943d8a1a38051dfb5ae;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index ae5a69c..eb70258 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ endif
 # for backward compatibility
 DESTDIR := $(INSTALL_DIR)
 
-# Configurable variables for installation (default /usr/local/...)
+# Configurable variables for installation (default /opt/AGL/xds/agent)
 ifeq ($(origin DESTDIR), undefined)
-	DESTDIR := /usr/local/bin
+	DESTDIR := /opt/AGL/xds/agent
 endif
 
 HOST_GOOS=$(shell go env GOOS)
@@ -82,9 +82,10 @@ build: tools/syncthing/copytobin
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
 
 package: clean tools/syncthing vendor build
-	@mkdir -p $(PACKAGE_DIR)/xds-agent
-	@cp agent-config.json.in $(PACKAGE_DIR)/xds-agent/agent-config.json
+	@mkdir -p $(PACKAGE_DIR)/xds-agent $(PACKAGE_DIR)/scripts
 	@cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent
+	cp -r $(ROOT_SRCDIR)/conf.d $(PACKAGE_DIR)/xds-agent
+	cp -r $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/scripts
 	cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
 
 .PHONY: package-all
@@ -121,8 +122,10 @@ distclean: clean
 	rm -rf $(LOCAL_BINDIR) tools glide.lock vendor $(ROOT_SRCDIR)/*.zip
 
 .PHONY: install
-install: all
-	mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
+install:
+	@test -e $(LOCAL_BINDIR)/xds-agent$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo 	"Please execute first: make all\n"; exit 1; }
+	export DESTDIR=$(DESTDIR) && $(ROOT_SRCDIR)/scripts/install.sh
 
 vendor: tools/glide glide.yaml
 	$(LOCAL_TOOLSDIR)/glide install --strip-vendor