--- Makefile.linux.orig 2015-09-12 15:11:30.436668490 -0700 +++ Makefile.linux 2015-09-12 15:11:23.370602487 -0700 @@ -6,7 +6,7 @@ @echo " " @echo "Next step - install with:" @echo " " - @echo " sudo make install" + @echo " sudo make -f Makefile.linux install" @echo " " CC := gcc @@ -294,7 +294,7 @@ # This is a step in the right direction but not sufficient to use /usr instead. -INSTALLDIR := /usr/local +INSTALLDIR := /usr # direwolf.desktop was previously handcrafted for the Raspberry Pi. @@ -317,7 +317,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' >> $@ @@ -330,24 +330,31 @@ install : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets \ tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop - 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 telemetry-toolkit/*.p[ly] $(INSTALLDIR)/bin - 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=755 direwolf $(INSTALLDIR)/bin + install -D --mode=755 decode_aprs $(INSTALLDIR)/bin + install -D --mode=755 text2tt $(INSTALLDIR)/bin + install -D --mode=755 tt2text $(INSTALLDIR)/bin + install -D --mode=755 ll2utm $(INSTALLDIR)/bin + install -D --mode=755 utm2ll $(INSTALLDIR)/bin + install -D --mode=755 aclients $(INSTALLDIR)/bin + install -D --mode=755 log2gpx $(INSTALLDIR)/bin + install -D --mode=755 gen_packets $(INSTALLDIR)/bin + install -D --mode=755 atest $(INSTALLDIR)/bin + install -D --mode=755 ttcalc $(INSTALLDIR)/bin + install -D --mode=755 dwespeak.sh $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin + install -D --mode=755 telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin + 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/pixmaps/direwolf/dw-icon.png + install -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop install -D --mode=644 README.md $(INSTALLDIR)/share/doc/direwolf/README.md install -D --mode=644 CHANGES.md $(INSTALLDIR)/share/doc/direwolf/CHANGES.md install -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt @@ -357,21 +364,21 @@ install -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf install -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf install -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf - 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" @echo "of the sample configuration file (direwolf.conf) in your home directory:" @echo " " - @echo " make install-conf" + @echo " make -f Makefile.linux install-conf" @echo " " @@ -390,14 +397,15 @@ .PHONY: install-conf install-conf : direwolf.conf - cp direwolf.conf ~ - cp telemetry-toolkit/telem-m0xer-3.txt ~ - cp telemetry-toolkit/telem-*.conf ~ + install -D --mode=644 direwolf.conf $(INSTALLDIR)/../etc/ax25/direwolf.conf + install -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/../etc/ax25/telem-m0xer-3.txt + install -D --mode=644 telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/../etc/ax25/telem-balloon.conf + install -D --mode=644 telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/../etc/ax25/telem-volts.conf ifneq ($(wildcard $(HOME)/Desktop),) @echo " " @echo "This will add a desktop icon on some systems:" @echo " " - @echo " make install-rpi" + @echo " make -f Makefile.linux install-rpi" @echo " " endif @@ -405,7 +413,7 @@ .PHONY: install-rpi install-rpi : dw-start.sh cp dw-start.sh ~ - ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop + ln -f -s $(INSTALLDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop @@ -563,15 +571,15 @@ .PHONY: tocalls-symbols tocalls-symbols : - cp tocalls.txt tocalls.txt~ + #cp tocalls.txt tocalls.txt~ wget http://www.aprs.org/aprs11/tocalls.txt -O tocalls.txt - diff tocalls.txt~ tocalls.txt - cp symbols-new.txt symbols-new.txt~ + #diff tocalls.txt~ tocalls.txt + #cp symbols-new.txt symbols-new.txt~ wget http://www.aprs.org/symbols/symbols-new.txt -O symbols-new.txt - diff symbols-new.txt~ symbols-new.txt - cp symbolsX.txt symbolsX.txt~ + #diff symbols-new.txt~ symbols-new.txt + #cp symbolsX.txt symbolsX.txt~ wget http://www.aprs.org/symbols/symbolsX.txt -O symbolsX.txt - diff symbolsX.txt~ symbolsX.txt + #diff symbolsX.txt~ symbolsX.txt #