--- Makefile.linux.orig 2017-04-26 18:55:00.396258538 -0700 +++ Makefile.linux 2017-04-27 08:52:00.416737071 -0700 @@ -1,3 +1,4 @@ + # # Makefile for Linux version of Dire Wolf. # @@ -484,7 +485,7 @@ # This is a step in the right direction but not sufficient to use /usr instead. # Eventually I'd like to have targets here to build the .DEB and .RPM packages. -INSTALLDIR := /usr/local +INSTALLDIR := /usr # Command to "install" to system directories. Use "ginstall" for Mac. @@ -510,7 +511,7 @@ endif @echo 'Name=Dire Wolf' >> $@ @echo 'Comment=APRS Soundcard TNC' >> $@ - @echo 'Icon=/usr/share/direwolf/dw-icon.png' >> $@ + @echo 'Icon=$(INSTALLDIR)/share/pixmaps/direwolf/dw-icon.png' >> $@ @echo "Path=$(HOME)" >> $@ @echo '#Terminal=true' >> $@ @echo 'Categories=HamRadio' >> $@ @@ -527,38 +528,38 @@ # Applications, not installed with package manager, normally go in /usr/local/bin. # /usr/bin is used instead when installing from .DEB or .RPM package. # - $(INSTALL) direwolf $(INSTALLDIR)/bin - $(INSTALL) decode_aprs $(INSTALLDIR)/bin - $(INSTALL) text2tt $(INSTALLDIR)/bin - $(INSTALL) tt2text $(INSTALLDIR)/bin - $(INSTALL) ll2utm $(INSTALLDIR)/bin - $(INSTALL) utm2ll $(INSTALLDIR)/bin - $(INSTALL) aclients $(INSTALLDIR)/bin - $(INSTALL) log2gpx $(INSTALLDIR)/bin - $(INSTALL) gen_packets $(INSTALLDIR)/bin - $(INSTALL) atest $(INSTALLDIR)/bin - $(INSTALL) ttcalc $(INSTALLDIR)/bin - $(INSTALL) dwespeak.sh $(INSTALLDIR)/bin + $(INSTALL) -D --mode=755 direwolf $(INSTALLDIR)/bin/direwolf + $(INSTALL) -D --mode=755 decode_aprs $(INSTALLDIR)/bin/decode_aprs + $(INSTALL) -D --mode=755 text2tt $(INSTALLDIR)/bin/text2tt + $(INSTALL) -D --mode=755 tt2text $(INSTALLDIR)/bin/tt2text + $(INSTALL) -D --mode=755 ll2utm $(INSTALLDIR)/bin/ll2utm + $(INSTALL) -D --mode=755 utm2ll $(INSTALLDIR)/bin/utm2ll + $(INSTALL) -D --mode=755 aclients $(INSTALLDIR)/bin/aclients + $(INSTALL) -D --mode=755 log2gpx $(INSTALLDIR)/bin/log2gpx + $(INSTALL) -D --mode=755 gen_packets $(INSTALLDIR)/bin/gen_packets + $(INSTALL) -D --mode=755 atest $(INSTALLDIR)/bin/atest + $(INSTALL) -D --mode=755 ttcalc $(INSTALLDIR)/bin/ttcalc + $(INSTALL) -D --mode=755 dwespeak.sh $(INSTALLDIR)/bin/dwspeak # # Telemetry Toolkit executables. Other .conf and .txt files will go into doc directory. # - $(INSTALL) telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin - $(INSTALL) telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin/telem-balloon.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin/telem-bits.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin/telem-data.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin/telem-data91.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin/telem-eqns.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin/telem-parm.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin/telem-seq.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin/telem-unit.pl + $(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin/telem-volts.pl # # Misc. data such as "tocall" to system mapping. # - $(INSTALL) -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt - $(INSTALL) -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt - $(INSTALL) -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt - $(INSTALL) -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png - $(INSTALL) -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop + $(INSTALL) -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt + $(INSTALL) -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt + $(INSTALL) -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt + $(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/dw-icon.png + $(INSTALL) -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop # # Documentation. Various plain text files and PDF. # @@ -594,16 +595,16 @@ # # "man" pages # - $(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1 - $(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/man/man1/atest.1 - $(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1 - $(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1 - $(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1 - $(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1 - $(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1 - $(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1 - $(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1 - $(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/man/man1/utm2ll.1 + $(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/share/man/man1/aclients.1 + $(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/share/man/man1/atest.1 + $(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/share/man/man1/decode_aprs.1 + $(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/share/man/man1/direwolf.1 + $(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/share/man/man1/gen_packets.1 + $(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/share/man/man1/ll2utm.1 + $(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/share/man/man1/log2gpx.1 + $(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/share/man/man1/text2tt.1 + $(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/share/man/man1/tt2text.1 + $(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/share/man/man1/utm2ll.1 # @echo " " @echo "If this is your first install, not an upgrade, type this to put a copy" @@ -625,10 +626,10 @@ .PHONY: install-conf install-conf : direwolf.conf - cp -n direwolf.conf ~ - cp -n sdr.conf ~ - cp -n telemetry-toolkit/telem-m0xer-3.txt ~ - cp -n telemetry-toolkit/telem-*.conf ~ + install -b -D --mode=644 direwolf.conf $(INSTALLDIR)/../etc/ax25/direwolf.conf + install -b -D --mode=644 sdr.conf $(INSTALLDIR)/../etc/ax25/sdr.conf + install -b -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/../etc/ax25/telemetry-toolkit/telem-m0xer-3.txt + install -b -D --mode=644 telemetry-toolkit/telem-*.conf $(INSTALLDIR)/../etc/ax25/telemetry-toolkit/telem-*.conf ifneq ($(wildcard $(HOME)/Desktop),) @echo " " @echo "This will add a desktop icon on some systems:" @@ -644,7 +645,7 @@ .PHONY: install-rpi install-rpi : dw-start.sh chmod +x dw-start.sh - cp -n dw-start.sh ~ + install -b -D --mode=644 dw-start.sh $(INSTALLDIR)/../usr/bin/dw-start.sh ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop