diff options
author | David <dbphillipsnz@gmail.com> | 2014-07-20 13:25:37 +1200 |
---|---|---|
committer | David <dbphillipsnz@gmail.com> | 2014-07-20 13:25:37 +1200 |
commit | 64091a89f410fc46918ee05a0226ccce90559328 (patch) | |
tree | b25f054759dda2c94c87cc3d8facfd31bd6aaa45 /Makefile | |
parent | 0a915305a6481f3b9553511376358ab81a51724c (diff) | |
parent | ce5d47962ac628521a658f20b3f48aee7d041fe3 (diff) | |
download | paramano-64091a89f410fc46918ee05a0226ccce90559328.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-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 ######################################################################## |