From 0e28714ce66bd5c0f2989e23e2273b5d97eac5e4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 21:05:38 +1100
Subject: [PATCH] Revert some of PT's local changes to the build system.

---
 common/Makefile.common | 4 ++--
 common/make_jar.sh     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/Makefile.common b/common/Makefile.common
index 89cb8d69..c1458a87 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -9,7 +9,7 @@ LOCALEDIR     = locale
 DOC_SRC_FILES = $(wildcard $(LOCALEDIR)/*/*.txt)
 LOCALES       = $(foreach locale,$(wildcard $(LOCALEDIR)/*),$(word 2,$(subst /, ,$(locale))))
 
-MAKE_JAR      = VERSION="$(VERSION)" DATE="$(BUILD_DATE)" bash  $(BASE)/make_jar.sh
+MAKE_JAR      = VERSION="$(VERSION)" DATE="$(BUILD_DATE)" sh $(BASE)/make_jar.sh
 
 # TODO: specify source files manually?
 JAR_BASES     = $(TOP) $(BASE)
@@ -45,7 +45,7 @@ TARGETS = all help info doc jar xpi install clean distclean $(JAR)
 $(TARGETS:%=\%.%):
 	echo MAKE $* $(@:$*.%=%)
 	$(MAKE) -C $* $(@:$*.%=%)
-	echo $$SHELL
+
 .PHONY: $(TARGETS)
 all: help
 
diff --git a/common/make_jar.sh b/common/make_jar.sh
index 00064e23..7632d64d 100644
--- a/common/make_jar.sh
+++ b/common/make_jar.sh
@@ -51,8 +51,6 @@ do
     )
 done
 
-cd $stage
-zip -r "$top/$jar" *
-cd -
+(cd $stage; zip -r "$top/$jar" *)
 rm -rf "$stage"