Makefile: cleanup

Remove extraneous slash from cp and rm commands.
Change the build directory to be just _one_ subdirectory.
Slight reoder and addition in the release target.
Signed-off-by: matt mooney <mfm@muteddisk.com>

Conflicts:

	Makefile

Makefile

 ABS_VERSION = 2.4.2
-BUILDDIR = build
+DESTDIR = $$PWD
 BINDIR = /usr/bin/
 CONFDIR = /etc/
 PROTOTYPEDIR = /usr/share/pacman/
-DESTDIR = $$PWD
+BUILDDIR = build/
 
 #### Output formatting ####
 SPC  = \x20
@@ -57,43 +57,43 @@ install:
 uninstall:
 	@echo -e "$(call MSG1,abs uninstall)"
 	@echo -e "$(call MSG2,Removing scripts)"
-	@rm $(DESTDIR)$(BINDIR)/abs
-	@rm $(DESTDIR)$(BINDIR)/makeworld
+	@rm $(DESTDIR)$(BINDIR)abs
+	@rm $(DESTDIR)$(BINDIR)makeworld
 	@echo -e "$(call MSG2,Removing configuration file)"
-	@rm $(DESTDIR)$(CONFDIR)/abs.conf
+	@rm $(DESTDIR)$(CONFDIR)abs.conf
 	@echo -e "$(call MSG2,Removing prototype files)"
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-bzr.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-cvs.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-darcs.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-git.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-gnome.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-haskell.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-hg.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-perl.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-python.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-rubygem.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/PKGBUILD-svn.proto
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/proto-gnome.install
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/proto-haskell.install
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/proto-info.install
-	@rm $(DESTDIR)$(PROTOTYPEDIR)/rc-script.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-bzr.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-cvs.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-darcs.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-git.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-gnome.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-haskell.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-hg.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-perl.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-python.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-rubygem.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)PKGBUILD-svn.proto
+	@rm $(DESTDIR)$(PROTOTYPEDIR)proto-gnome.install
+	@rm $(DESTDIR)$(PROTOTYPEDIR)proto-haskell.install
+	@rm $(DESTDIR)$(PROTOTYPEDIR)proto-info.install
+	@rm $(DESTDIR)$(PROTOTYPEDIR)rc-script.proto
 
 .PHONY: release
 release:
 	@echo -e "$(call MSG1,Build abs-$(ABS_VERSION) release)"
 	@echo -e "$(call MSG2,Creating build directory)"
-	@mkdir -p $(BUILDDIR)/abs
+	@mkdir $(BUILDDIR)
 	@echo -e "$(call MSG2,Copying files)"
-	@cp Makefile $(BUILDDIR)/abs/
-	@cp abs $(BUILDDIR)/abs/
-	@cp makeworld $(BUILDDIR)/abs/
-	@cp README $(BUILDDIR)/abs/
-	@cp COPYING $(BUILDDIR)/abs/
-	@cp -R conf $(BUILDDIR)/abs/
-	@cp -R prototypes $(BUILDDIR)/abs/
-	@cp -R scripts $(BUILDDIR)/abs/
+	@cp abs $(BUILDDIR)
+	@cp AUTHORS $(BUILDDIR)
+	@cp COPYING $(BUILDDIR)
+	@cp Makefile $(BUILDDIR)
+	@cp makeworld $(BUILDDIR)
+	@cp README $(BUILDDIR)
+	@cp -R conf $(BUILDDIR)
+	@cp -R prototypes $(BUILDDIR)
+	@cp -R scripts $(BUILDDIR)
 	@echo -e "$(call MSG2,Tarring files)"
-	@cd $(BUILDDIR) && tar czf abs-$(ABS_VERSION).tar.gz "abs/"
-	@mv $(BUILDDIR)/abs-$(ABS_VERSION).tar.gz .
+	@tar czf abs-$(ABS_VERSION).tar.gz $(BUILDDIR) --transform="s#^$(BUILDDIR)*#abs/#"
 	@echo -e "$(call MSG2,Removing build directory)"
 	@rm -rf $(BUILDDIR)