From aa4c9e9a2e7e4c5557774481b9e608bd9343a1b7 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@apple2pie.(none)>
Date: Thu, 19 Sep 2013 17:25:10 -0700
Subject: [PATCH] Clean up Makefile

---
 src/Makefile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index d8a4013..e9d7c8b 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,10 @@
 PACKAGE=a2pi
 VERSION=0.9.0
+PREFIX=/usr/local
 BIN= a2serclk a2pid a2joy a2joymou a2joypad a2mon a2term dskread dskwrite bintomon bload brun text2merlin merlin2text
-BINDIR= /usr/local/bin
+BINDIR=$(PREFIX)/bin
 DIST=$(PACKAGE)-$(VERSION)
-DISTDIR=$(DIST)
+DISTDIR=./$(DIST)
 
 all: $(BIN) fusea2pi
 
@@ -11,7 +12,7 @@ fusea2pi: fusea2pi.c a2lib.c
 	$(CC) -I/usr/include/fuse -D_FILE_OFFSET_BITS=64 fusea2pi.c -lfuse -o fusea2pi
 
 clean:
-	rm $(BIN) *~ fusea2pi
+	-rm $(BIN) *~ fusea2pi
 
 install:
 	cp $(BIN) fusea2pi a2mount $(BINDIR)
@@ -21,7 +22,7 @@ uninstall:
 	cd $(BINDIR); rm $(BIN) fusea2pi a2mount
 
 dist:
-	rm -rf $(DISTDIR)
+	-rm -rf $(DISTDIR)
 	mkdir $(DISTDIR)
 	-chmod 777 $(DISTDIR)
 	cp ../LICENSE.txt $(DISTDIR)
@@ -29,9 +30,13 @@ dist:
 	mkdir $(DISTDIR)/docs
 	cp ../docs/* $(DISTDIR)/docs
 	mkdir $(DISTDIR)/src
-	cp ../src/*.c $(DISTDIR)/src
-	cp ../src/*.sh $(DISTDIR)/src
-	cp ../src/Makefile $(DISTDIR)/src
+	cp *.c $(DISTDIR)/src
+	cp *.sh $(DISTDIR)/src
+	cp *.conf $(DISTDIR)/src
+	cp *.bin $(DISTDIR)/src
+	cp *.mon $(DISTDIR)/src
+	cp *.PO $(DISTDIR)/src
+	cp a2mount execfile Makefile $(DISTDIR)/src
 	-chmod -R a+r $(DISTDIR)
 	tar czf $(DIST).tar.gz $(DISTDIR)
 	rm -rf $(DISTDIR)
\ No newline at end of file