=== Makefile.PL
==================================================================
--- Makefile.PL	(revision 10071)
+++ Makefile.PL	(revision 10072)
@@ -0,0 +1,38 @@
+# Copyright (C) 2008 Wes Hardaker
+# License: GNU GPLv2.  See the COPYING file for details.
+#!/usr/bin/perl
+
+use ExtUtils::MakeMaker;
+
+%opts = (
+	 'NAME'		=> 'yfk',
+	 'PREREQ_PM'    => { DBI => 0 },
+	 'EXE_FILES'    => [qw(yfk)],
+         'VERSION_FROM' => 'yfk',         # finds $VERSION
+	);
+
+if (!($^O eq 'MSWin32' || $Config{'ccflags'} =~ /-D_?WIN32_?/)) {
+    # doesn't work on windows: no sed
+    $opts{'PM_FILTER'} = 'sed -e "s|/usr/local|$(PREFIX)|"';
+}
+
+WriteMakefile(%opts);
+
+sub MY::postamble {
+    return '
+
+YFKDIR=$(DESTDIR)$(PREFIX)/share/yfklog
+
+INSTALL=$(PERL) "-MExtUtils::Command" -e cp
+
+install:: installstuff installfixpaths
+
+installstuff:
+	$(MKPATH) $(YFKDIR)/labels
+	$(INSTALL) yfksubs.pl db_* cty.dat config p.png $(YFKDIR)
+	$(INSTALL) *.lab $(YFKDIR)/labels
+
+installfixpaths:
+	$(PERL) -p -i -e "s|/usr/local|$(PREFIX)|" $(DISTDIR)$(PREFIX)/bin/yfk
+';
+}
=== yfk
==================================================================
--- yfk	(revision 10071)
+++ yfk	(revision 10072)
@@ -26,7 +26,7 @@
 use Curses;	
 use Net::FTP;			# upload of online log or backup
 
-my $prefix="/usr";		
+my $prefix="/usr/local";		
 
 require "$prefix/share/yfklog/yfksubs.pl";	
 import yfksubs;
=== yfksubs.pl
==================================================================
--- yfksubs.pl	(revision 10071)
+++ yfksubs.pl	(revision 10072)
@@ -88,7 +88,7 @@
 our $lotwdetails='0';							# LOTW import details?
 our $autoqueryrig='0';							# Query rig at new QSO?
 our $directory='/tmp/';							# where to look for stuff
-our $prefix="/usr";								# may be changed by 'make'
+our $prefix="/usr/local";								# may be changed by 'make'
 my $db='';										# sqlite or mysql?
 our $fieldorder=									# TAB/Field order.
 'CALL DATE TON TOFF BAND MODE QTH NAME QSLS QSLR RSTS RSTR REM PWR';
=== Makefile
==================================================================
--- Makefile	(revision 10071)
+++ Makefile	(revision 10072)
@@ -1,56 +0,0 @@
-VERSION=0.3.4
-
-DESTDIR ?= /usr
-
-all: 
-	@echo "Nothing to do. make install|uninstall|clean|dist [DESTDIR=/usr]"
-
-install:
-	sed 's^prefix="/usr"^prefix="$(DESTDIR)"^g' yfksubs.pl > yfksubs2.pl 
-	sed 's^prefix="/usr"^prefix="$(DESTDIR)"^g' yfk > yfk2 
-	rm -f yfksubs.pl
-	rm -f yfk
-	mv yfksubs2.pl yfksubs.pl
-	mv yfk2 yfk
-	chmod 0755 yfk
-	install -d -v				$(DESTDIR)/share/yfklog/
-	install -d -v				$(DESTDIR)/share/yfklog/labels/
-	install -d -v				$(DESTDIR)/bin/
-	install -m 0755 yfk 		$(DESTDIR)/bin/ 
-	install -m 0444 yfksubs.pl 	$(DESTDIR)/share/yfklog/
-	install -m 0444 db_* 		$(DESTDIR)/share/yfklog/
-	install -m 0444 cty.dat		$(DESTDIR)/share/yfklog/
-	install -m 0444 config		$(DESTDIR)/share/yfklog/
-	install -m 0444 p.png		$(DESTDIR)/share/yfklog/
-	install -m 0444 *.lab		$(DESTDIR)/share/yfklog/labels/
-
-uninstall:
-	rm -f  $(DESTDIR)/bin/yfk
-	rm -rf $(DESTDIR)/share/yfklog/
-
-clean:
-	rm -f *~ 
-
-dist:
-	sed 's/Version [0-9].[0-9].[0-9]/Version $(VERSION)/g' README > README2
-	rm -f README
-	mv README2 README
-	sed 's/Version [0-9].[0-9].[0-9]/Version $(VERSION)/g' MANUAL > MANUAL2
-	rm -f MANUAL
-	mv MANUAL2 MANUAL
-	rm -f releases/yfklog-$(VERSION).tar.gz
-	rm -rf releases/yfklog-$(VERSION)
-	mkdir yfklog-$(VERSION)
-	mkdir yfklog-$(VERSION)/clubs/
-	mkdir yfklog-$(VERSION)/onlinelog/
-	cp yfk yfksubs.pl config cty.dat AUTHORS CHANGELOG db_*.sql *.sqlite THANKS \
-	Makefile INSTALL MANUAL README p.png RELEASENOTES *.lab yfklog-$(VERSION)
-	cp clubs/README yfklog-$(VERSION)/clubs
-	cp clubs/hscmember.txt yfklog-$(VERSION)/clubs
-	cp clubs/hsc2sql.awk yfklog-$(VERSION)/clubs
-	cp onlinelog/README yfklog-$(VERSION)/onlinelog
-	cp onlinelog/search.php yfklog-$(VERSION)/onlinelog
-	cp onlinelog/test.txt yfklog-$(VERSION)/onlinelog
-	tar -zcf yfklog-$(VERSION).tar.gz yfklog-$(VERSION)
-	mv yfklog-$(VERSION) releases/
-	mv yfklog-$(VERSION).tar.gz releases/