From 5fd3987e0ae4a8914b729b0ec7c175291b746dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9F=D1=80=D0=BE?= =?UTF-8?q?=D1=85=D0=BE=D1=80=D0=BE=D0=B2?= Date: Mon, 24 Sep 2018 13:48:35 +0200 Subject: [PATCH] Fix improper use of DESTDIR convention --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 717da8d..70f57de 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ -DESTDIR:=/opt +DESTDIR:=/ +prefix:=$(DESTDIR)/opt REBAR3:=./rebar3 -SERVICE:=/etc/systemd/system/mtproto-proxy.service -LOGDIR:=/var/log/mtproto-proxy +SERVICE:=$(DESTDIR)/etc/systemd/system/mtproto-proxy.service +LOGDIR:=$(DESTDIR)/var/log/mtproto-proxy USER:=mtproto-proxy @@ -22,14 +23,15 @@ $(LOGDIR): install: $(LOGDIR) sudo useradd -r $(USER) || true - cp -n -r _build/prod/rel/mtp_proxy $(DESTDIR) - mkdir -p $(DESTDIR)/mtp_proxy/log - chmod 777 $(DESTDIR)/mtp_proxy/log - cp -n config/mtproto-proxy.service $(SERVICE) + mkdir -p $(prefix)/mtp_proxy + cp -n -r _build/prod/rel/mtp_proxy $(prefix)/mtp_proxy + mkdir -p $(prefix)/mtp_proxy/log + chmod 777 $(prefix)/mtp_proxy/log + install -D config/mtproto-proxy.service $(SERVICE) systemctl daemon-reload uninstall: # TODO: ensure service is stopped rm $(SERVICE) - rm -r $(DESTDIR)/mtp_proxy + rm -r $(prefix)/mtp_proxy systemctl daemon-reload