From 424b1f94e352d0478a1b2a0d85a00625a763f49f Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Mon, 24 Oct 2011 17:04:31 -0400
Subject: [PATCH] maint: updated the target scripts to remove hardcoded build/
 directory

---
 maintainer/barrychroots | 13 ++++++++-----
 maintainer/barrylocal   |  3 ++-
 maintainer/barryremote  |  9 +++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/maintainer/barrychroots b/maintainer/barrychroots
index 8cfd24c3..03561716 100644
--- a/maintainer/barrychroots
+++ b/maintainer/barrychroots
@@ -4,6 +4,7 @@
 #
 #    $BARRYTARBALL  - relative path to the release source tarball (bz2)
 #    $BARRYTARBASE  - basename of the source tarball (bz2)
+#    $BARRYBUILDDIR - directory where results are stored
 #
 
 set -e
@@ -25,8 +26,9 @@ function do_ubuntu() {
 			"fakeroot -- debian/rules binary os22-binary"
 }
 
-do_ubuntu ubuntu1004 build/ubuntu1004 ubuntu1004
-do_ubuntu ubuntu804 build/ubuntu804 ubuntu804
+do_ubuntu ubuntu1004 $BARRYBUILDDIR/ubuntu1004 ubuntu1004
+do_ubuntu ubuntu804 $BARRYBUILDDIR/ubuntu804 ubuntu804
+chown -R cdfrey:cdfrey $BARRYBUILDDIR
 
 
 #
@@ -57,12 +59,13 @@ function do_fedora() {
 # its /usr/lib/pkgconfig/libgcal.pc file manually to work around it
 # for now
 #do_fedora fedora14 build/fedora14 f14 "rpmbuild --target i386 -ba barry.spec --with gui --with opensync --with desktop"
-do_fedora fedora13 build/fedora13 f13 \
+do_fedora fedora13 $BARRYBUILDDIR/fedora13 f13 \
 	"rpmbuild --target i386 -ba barry.spec --with gui --with opensync --with desktop"
-do_fedora fedora12 build/fedora12 f12 \
+do_fedora fedora12 $BARRYBUILDDIR/fedora12 f12 \
 	"rpmbuild --target i386 -ba barry.spec --with gui --with opensync --with desktop"
-do_fedora fedora11 build/fedora11 f11 \
+do_fedora fedora11 $BARRYBUILDDIR/fedora11 f11 \
 	"rpmbuild --target i386 -ba barry.spec --with gui --with opensync"
+chown -R cdfrey:cdfrey $BARRYBUILDDIR
 
 #
 # Cleanup
diff --git a/maintainer/barrylocal b/maintainer/barrylocal
index 256fc29b..4794aac7 100644
--- a/maintainer/barrylocal
+++ b/maintainer/barrylocal
@@ -4,6 +4,7 @@
 #
 #    $BARRYTARBALL  - relative path to the release source tarball (bz2)
 #    $BARRYTARBASE  - basename of the source tarball (bz2)
+#    $BARRYBUILDDIR - directory where results are stored
 #
 
 set -e
@@ -11,7 +12,7 @@ set -e
 #
 # Build the local DEB's
 #
-./save.sh /tmp/barrylb22/results build/debian squeeze \
+./save.sh /tmp/barrylb22/results $BARRYBUILDDIR/debian squeeze \
 	./make-deb.sh "$BARRYTARBALL" \
 		"fakeroot -- debian/rules binary os22-binary" \
 		/usr/src /tmp/barrylb22
diff --git a/maintainer/barryremote b/maintainer/barryremote
index 61fb166a..90cfc866 100644
--- a/maintainer/barryremote
+++ b/maintainer/barryremote
@@ -4,6 +4,7 @@
 #
 #    $BARRYTARBALL  - relative path to the release source tarball (bz2)
 #    $BARRYTARBASE  - basename of the source tarball (bz2)
+#    $BARRYBUILDDIR - directory where results are stored
 #
 
 set -e
@@ -30,11 +31,11 @@ function do_ubuntu() {
 			"fakeroot -- debian/rules binary os22-binary"
 }
 
-do_ubuntu ubuntu1004 build/ubuntu1004-64 ubuntu1004
-do_ubuntu ubuntu804 build/ubuntu804-64 ubuntu804
+do_ubuntu ubuntu1004 $BARRYBUILDDIR/ubuntu1004-64 ubuntu1004
+do_ubuntu ubuntu804 $BARRYBUILDDIR/ubuntu804-64 ubuntu804
 
 # Build on the Debian squeeze host system too
-./save.sh /tmp/barryremote/squeeze build/squeeze-64 squeeze \
+./save.sh /tmp/barryremote/squeeze $BARRYBUILDDIR/squeeze-64 squeeze \
 	./remote.sh cdfrey barrybuild.netdirect.ca 22 \
 		"$BARRYTARBALL make-deb.sh" \
 		/home/cdfrey/barryremote/results \
@@ -66,7 +67,7 @@ function do_fedora() {
 			/home/cdfrey/rpmbuild/binarybuild
 }
 
-do_fedora fedora14 build/fedora14 f14 \
+do_fedora fedora14 $BARRYBUILDDIR/fedora14 f14 \
 	"rpmbuild -ba barry.spec --with gui --with opensync --with desktop"
 
 
-- 
2.11.4.GIT