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"