--- Makefile.linux-orig	2014-11-21 18:36:04.000000000 -0800
+++ Makefile.linux	2014-12-21 09:20:58.754343154 -0800
@@ -78,13 +78,13 @@
 # cause compatibility issues for those with older computers.
 #
 
-arch := $(shell echo | gcc -E -dM - | grep __i386__)
+arch := $(shell echo | gcc -E -dM - | grep __SSE2__)
 
 ifneq ($(arch),)
 # You might see improvement with -march fine tuned to your hardware.
 # Probably should keep pentium3 if you will be redistributing binaries
 # to other people.
-CFLAGS := -O3 -march=pentium3 -pthread -Iutm
+CFLAGS := -O3 -march=native -pthread -Iutm
 else
 CFLAGS := -O3 -pthread -Iutm
 endif
@@ -104,6 +104,13 @@
 #LDLIBS += -lgps
 
 
+#default installation use DESTDIR=<path> on the commandline to override
+DESTDIR = /usr/local
+
+#Do NOT include a slash on the front of this variable
+#PREFIX = usr/local
+PREFIX = usr
+
 
 # Name of current directory.
 # Used to generate zip file name for distribution.
@@ -150,27 +157,27 @@
 # TODO: Review file locations.
 
 install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop
-	install direwolf /usr/local/bin
-	install decode_aprs /usr/local/bin
-	install text2tt /usr/local/bin
-	install tt2text /usr/local/bin
-	install ll2utm /usr/local/bin
-	install utm2ll /usr/local/bin
-	install aclients /usr/local/bin
-	install log2gpx /usr/local/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=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt
-	install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt
-	install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt
-	install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf
-	install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
-	install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-	install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
+	install -D direwolf $(DESTDIR)/$(PREFIX)/bin/direwolf
+	install -D decode_aprs $(DESTDIR)/$(PREFIX)/bin/decode_aprs
+	install -D text2tt $(DESTDIR)/$(PREFIX)/bin/text2tt
+	install -D tt2text $(DESTDIR)/$(PREFIX)/bin/tt2text
+	install -D ll2utm $(DESTDIR)/$(PREFIX)/bin/ll2utm
+	install -D utm2ll $(DESTDIR)/$(PREFIX)/bin/utm2ll
+	install -D aclients $(DESTDIR)/$(PREFIX)/bin/aclients
+	install -D log2gpx $(DESTDIR)/$(PREFIX)/bin/log2gpx
+	install -D --mode=644 tocalls.txt $(DESTDIR)/$(PREFIX)/share/direwolf/tocalls.txt
+	install -D --mode=644 symbols-new.txt $(DESTDIR)/$(PREFIX)/share/direwolf/symbols-new.txt
+	install -D --mode=644 symbolsX.txt $(DESTDIR)/$(PREFIX)/share/direwolf/symbolsX.txt
+	install -D --mode=644 dw-icon.png $(DESTDIR)/$(PREFIX)/share/direwolf/dw-icon.png
+	install -D --mode=644 direwolf.desktop $(DESTDIR)/$(PREFIX)/share/applications/direwolf.desktop
+	install -D --mode=644 CHANGES.txt $(DESTDIR)/$(PREFIX)/share/doc/direwolf/CHANGES.txt
+	install -D --mode=644 LICENSE-dire-wolf.txt $(DESTDIR)/$(PREFIX)/share/doc/direwolf/LICENSE-dire-wolf.txt
+	install -D --mode=644 LICENSE-other.txt $(DESTDIR)/$(PREFIX)/share/doc/direwolf/LICENSE-other.txt
+	install -D --mode=644 User-Guide.pdf $(DESTDIR)/$(PREFIX)/share/doc/direwolf/User-Guide.pdf
+	install -D --mode=644 Raspberry-Pi-APRS.pdf $(DESTDIR)/$(PREFIX)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
+	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)/$(PREFIX)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
+	install -D --mode=644 APRStt-Implementation-Notes.pdf $(DESTDIR)/$(PREFIX)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
+	install -D --mode=644 Quick-Start-Guide-Windows.pdf $(DESTDIR)/$(PREFIX)/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
 
 
 # The Raspberry Pi has ~/Desktop but Ubuntu does not.
@@ -183,7 +190,7 @@
 	ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
 
 install-conf : direwolf.conf
-	cp direwolf.conf ~
+	install -D --mode=644 direwolf.conf $(DESTDIR)/etc/ax25/direwolf.conf
 
 
 # Separate application to decode raw data.