From 0f6f7f161042fbba7e2436eb361321f954794c19 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 28 Jan 2011 05:12:42 -0500
Subject: [PATCH] Fix building with XPI=/absolute/path.

---
 common/Makefile    |  4 ++--
 common/make_jar.sh | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index f2460f4e..9e7169e8 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -35,8 +35,8 @@ XPI_TEXTS     = js jsm $(JAR_TEXTS)
 XPI_BINS      = $(JAR_BINS)
 
 XPI_NAME      = $(NAME)-$(VERSION)
-XPI_PATH      = ../downloads/$(XPI_NAME)
-XPI           = $(XPI_PATH).xpi
+XPI_PATH      = ../downloads/
+XPI           = $(XPI_PATH)$(XPI_NAME).xpi
 
 RDF           = ../downloads/update.rdf
 RDF_IN        = $(RDF).in
diff --git a/common/make_jar.sh b/common/make_jar.sh
index 5e08f522..f12b5ee7 100644
--- a/common/make_jar.sh
+++ b/common/make_jar.sh
@@ -49,7 +49,13 @@ copytext() {
     ( echo "modified: $1"; diff -u -- "$1" "$2" | grep '^[-+][^-+]' )
 }
 
-[ -e "$top/$jar" ] && rm -rf "$top/$jar"
+[ -f "$jar" ] && rm -f "$jar"
+case "$jar" in
+    /*) ;;
+    *)
+        [ -d "$jar" ] && rm -rf "$jar"
+        jar="$top/$jar";;
+esac
 
 for base in $bases
 do
@@ -82,12 +88,12 @@ done
     set -e;
     cd $stage;
     case $jar in
-    (*/) if [ "$stage" != "$top/$jar" ]; then mv -- * $top/$jar; fi;;
-    (*)  zip -9r "$top/$jar" -- *;;
+    (*/) if [ "$stage" != "$jar" ]; then mv -- * $jar; fi;;
+    (*)  zip -9r "$jar" -- *;;
     esac
 ) || exit 1
 
-[ "$stage" != "$top/$jar" ] && rm -rf "$stage"
+[ "$stage" != "$jar" ] && rm -rf "$stage"
 true
 
 # vim:se ft=sh sts=4 sw=4 et: