aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-06-16 14:13:20 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-06-16 14:13:20 +0200
commit03ea9e0e7107d59f207b3842f9fc3f74d036ac91 (patch)
treeb25a65cff138b2dfec746355d101654672e96af6
parent53f2a0c56e9604b8ac5cff73e62fc387c4676365 (diff)
Used standard DESTDIR variable in make install
-rw-r--r--Makefile8
-rw-r--r--README.md11
2 files changed, 14 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 22b954a..902a238 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,12 @@ ifeq ($(origin SUB_VERSION), undefined)
endif
endif
+# for backward compatibility
+DESTDIR := $(INSTALL_DIR)
# Configurable variables for installation (default /usr/local/...)
-ifeq ($(origin INSTALL_DIR), undefined)
- INSTALL_DIR := /usr/local/bin
+ifeq ($(origin DESTDIR), undefined)
+ DESTDIR := /usr/local/bin
endif
HOST_GOOS=$(shell go env GOOS)
@@ -117,7 +119,7 @@ distclean: clean
.PHONY: install
install: all
- mkdir -p $(INSTALL_DIR) && cp $(LOCAL_BINDIR)/* $(INSTALL_DIR)
+ mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
vendor: tools/glide glide.yaml
./tools/glide install --strip-vendor
diff --git a/README.md b/README.md
index 4249251..06d0725 100644
--- a/README.md
+++ b/README.md
@@ -30,12 +30,19 @@ Clone this repo into your `$GOPATH/src/github.com/iotbzh` and use delivered Make
make all
```
-And to install xds-agent in /usr/local/bin:
+And to install xds-agent (by default in `/usr/local/bin`):
```bash
make install
```
-> **NOTE**: To cross build for example for Windows, just execute:
+>**NOTE:** Used `DESTDIR` to specify another install directory
+>```bash
+>make install DESTDIR=$HOME/opt/xds-agent
+>```
+
+
+#### Cross build
+For example on a Linux machine to cross-build for Windows, just execute:
```bash
export GOOS=windows
export GOARCH=amd64