[or-cvs] [https-everywhere/master 3/3] Use dkg's approach but keep the pkg/ directory

[pde at torproject.org]

Author: Peter Eckersley <pde at eff.org>
Date: Wed, 3 Nov 2010 22:46:08 -0700
Subject: Use dkg's approach but keep the pkg/ directory
Commit: ae4600cd67d0b97ffb50f1629796641ea4b0211e

(I like to keep a stack of old builds around and not have everything
cluttered)
---
 Makefile   |    6 ++++--
 makexpi.sh |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2f8f054..c2db721 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,11 @@
 %:
 	./makexpi.sh $@
 # this makes prerelease xpis (and is the default rule)
-prerelease:
+prerelease: pkg
 	./makexpi.sh
+pkg:
+	mkdir pkg
 clean:
-	rm -f *.xpi
+	rm -f pkg/*.xpi
 
 .PHONY: clean prerelease
diff --git a/makexpi.sh b/makexpi.sh
index b96f8a2..a375896 100755
--- a/makexpi.sh
+++ b/makexpi.sh
@@ -22,7 +22,7 @@ else
     VERSION="$(grep em:version src/install.rdf | sed -e 's/[<>]/	/g' | cut -f3)~pre"
     TARG=HEAD
 fi
-XPI_NAME="$APP_NAME-$VERSION.xpi"
+XPI_NAME="pkg/$APP_NAME-$VERSION.xpi"
 
 cd "$(dirname $0)/src"
 git archive --format=zip -9 "$TARG" . > "../$XPI_NAME"
-- 
1.7.1