From 2b7f7a71a10f7caa4c12e8b6922f47dd2267fe6c Mon Sep 17 00:00:00 2001
From: Erik Nolte <enolte@beyondoblivion.com>
Date: Mon, 8 Aug 2011 10:47:48 -0600
Subject: [PATCH] Remove leftover build files and build results before creating
 package

---
 pkg/arch/Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 pkg/arch/Makefile

diff --git a/pkg/arch/Makefile b/pkg/arch/Makefile
old mode 100644
new mode 100755
index ab40067524..ef6b30c8a3
--- a/pkg/arch/Makefile
+++ b/pkg/arch/Makefile
@@ -2,10 +2,22 @@
 # prior to committing changes to git.
 
 local:
-	makepkg -f -p PKGBUILD-local --asroot
+	-rm -rf ../../build
+	-rm salt-*.pkg.tar.xz
+	-rm -rf pkg
+	if [ "$$(id -u)" -eq 0 ]; \
+	then \
+	    makepkg -f -p PKGBUILD-local --asroot; \
+	else \
+	    makepkg -f -p PKGBUILD-local; \
+	fi
 	rm -rf pkg
+	-rm -rf ../../build
 
 install: local
+	-/etc/rc.d/salt-monitor stop
+	-/etc/rc.d/salt-minion stop
+	-/etc/rc.d/salt-master stop
 	-yes | pacman -R salt-local
 	-yes | pacman -R salt-git
 	-yes | pacman -R salt