summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-27 14:45:38 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-27 14:45:38 -0700
commitaf23596c3425b97af833ee1e87e1c35080a7315c (patch)
tree1ec0b6f943627da860b3106759b8d8946cb4e7d4
parent233945e60fd2d4779d19536b4330025e350b3ed4 (diff)
downloadinfinitytier-af23596c3425b97af833ee1e87e1c35080a7315c.tar.gz
infinitytier-af23596c3425b97af833ee1e87e1c35080a7315c.zip
Put everything in /usr/sbin on Linux.
-rw-r--r--make-linux.mk13
1 files changed, 6 insertions, 7 deletions
diff --git a/make-linux.mk b/make-linux.mk
index d466c6a4..8bfee3a0 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -161,11 +161,10 @@ install: FORCE
mkdir -p $(DESTDIR)/usr/sbin
rm -f $(DESTDIR)/usr/sbin/zerotier-one
cp -f zerotier-one $(DESTDIR)/usr/sbin/zerotier-one
- mkdir -p $(DESTDIR)/usr/bin
- rm -f $(DESTDIR)/usr/bin/zerotier-cli
- rm -f $(DESTDIR)/usr/bin/zerotier-idtool
- ln -s ../sbin/zerotier-one $(DESTDIR)/usr/bin/zerotier-cli
- ln -s ../sbin/zerotier-one $(DESTDIR)/usr/bin/zerotier-idtool
+ rm -f $(DESTDIR)/usr/sbin/zerotier-cli
+ rm -f $(DESTDIR)/usr/sbin/zerotier-idtool
+ ln -s zerotier-one $(DESTDIR)/usr/sbin/zerotier-cli
+ ln -s zerotier-one $(DESTDIR)/usr/sbin/zerotier-idtool
mkdir -p $(DESTDIR)/var/lib/zerotier-one
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
@@ -189,8 +188,8 @@ uninstall: FORCE
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
- rm -f $(DESTDIR)/usr/bin/zerotier-cli
- rm -f $(DESTDIR)/usr/bin/zerotier-idtool
+ rm -f $(DESTDIR)/usr/sbin/zerotier-cli
+ rm -f $(DESTDIR)/usr/sbin/zerotier-idtool
rm -f $(DESTDIR)/usr/sbin/zerotier-one
rm -rf $(DESTDIR)/var/lib/zerotier-one/iddb.d
rm -rf $(DESTDIR)/var/lib/zerotier-one/updates.d