diff options
| -rw-r--r-- | common/Makefile | 7 | ||||
| -rw-r--r-- | common/make_jar.sh | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/common/Makefile b/common/Makefile index 9e7169e8..2c263220 100644 --- a/common/Makefile +++ b/common/Makefile @@ -47,7 +47,7 @@ AWK ?= awk B64ENCODE ?= base64 CURL ?= curl -#.SILENT: +.SILENT: #### rules @@ -84,7 +84,6 @@ info: @echo "doc files $(DOC_FILES)" @echo "xpi files $(XPI_FILES)" -xpi: $(XPI) jar: $(JAR) release: $(XPI) $(RDF) @@ -169,7 +168,7 @@ test: $(XPI) #### xpi -$(XPI): $(CHROME) +xpi: $(CHROME) @echo "Building XPI..." mkdir -p $(XPI_PATH) @@ -179,7 +178,7 @@ $(XPI): $(CHROME) $(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)" rm -r -- $(CHROME) - @echo "Built XPI: $@" + @echo "Built XPI: $XPI" #### jar diff --git a/common/make_jar.sh b/common/make_jar.sh index f12b5ee7..a84aad83 100644 --- a/common/make_jar.sh +++ b/common/make_jar.sh @@ -2,7 +2,7 @@ set -e fromrepo= -if [ $1 = -r ]; then shift; fromrepo=1; fi +if [ "$1" = -r ]; then shift; fromrepo=1; fi top=$(pwd) jar=$1 @@ -15,7 +15,7 @@ files="$@" HG=${HG:-hg} stage="$top/${jar%.*}" -mkdir -p $stage +mkdir -p "$stage" sed=$(which sed) if [ "xoo" = x$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ] @@ -86,9 +86,9 @@ done ( set -e; - cd $stage; - case $jar in - (*/) if [ "$stage" != "$jar" ]; then mv -- * $jar; fi;; + cd "$stage"; + case "$jar" in + (*/) if [ "$stage" != "$jar" ]; then mv -- * "$jar"; fi;; (*) zip -9r "$jar" -- *;; esac ) || exit 1 |