aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDavid <dbphillipsnz@gmail.com>2014-07-20 13:25:37 +1200
committerDavid <dbphillipsnz@gmail.com>2014-07-20 13:25:37 +1200
commitff7fb8228934bcecbe93f0ce5b15dd032d0b286b (patch)
treeb25f054759dda2c94c87cc3d8facfd31bd6aaa45 /Makefile
parentf33d490cc017c0a4915bb2ec175df0238702442b (diff)
parent24a150d3b0b1d4f42ffa5459f5a126415c96c6b4 (diff)
downloadparamano-ff7fb8228934bcecbe93f0ce5b15dd032d0b286b.tar.xz
Merge branch 'master' into stable
Conflicts: Makefile tray.c trayfreq.conf.src trayfreq_set_interface.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5bed254..589df84 100644
--- a/Makefile
+++ b/Makefile
@@ -144,6 +144,5 @@ install:
install -Dm 755 trayfreq $(DESTDIR)/$(BINDIR)/trayfreq
install -Dm 755 trayfreq-set $(DESTDIR)/$(BINDIR)/trayfreq-set
- ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/$(SHAREDIR)/trayfreq/LICENCE
ln -s ../../../etc/trayfreq.conf $(DESTDIR)/$(SHAREDIR)/trayfreq/trayfreq.conf
########################################################################