gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-20 13:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix building with XPI=/absolute/path.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-28 05:12:42 -05:00
parent e20133ae1f
commit 0f6f7f1610
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/Makefile
View File

@@ -35,8 +35,8 @@ XPI_TEXTS = js jsm $(JAR_TEXTS)
XPI_BINS = $(JAR_BINS) XPI_BINS = $(JAR_BINS)
XPI_NAME = $(NAME)-$(VERSION) XPI_NAME = $(NAME)-$(VERSION)
XPI_PATH = ../downloads/$(XPI_NAME) XPI_PATH = ../downloads/
XPI = $(XPI_PATH).xpi XPI = $(XPI_PATH)$(XPI_NAME).xpi
RDF = ../downloads/update.rdf RDF = ../downloads/update.rdf
RDF_IN = $(RDF).in RDF_IN = $(RDF).in

14
common/make_jar.sh
View File

@@ -49,7 +49,13 @@ copytext() {
( echo "modified: $1"; diff -u -- "$1" "$2" | grep '^[-+][^-+]' ) ( 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 for base in $bases
do do
@@ -82,12 +88,12 @@ done
set -e; set -e;
cd $stage; cd $stage;
case $jar in case $jar in
(*/) if [ "$stage" != "$top/$jar" ]; then mv -- * $top/$jar; fi;; (*/) if [ "$stage" != "$jar" ]; then mv -- * $jar; fi;;
(*) zip -9r "$top/$jar" -- *;; (*) zip -9r "$jar" -- *;;
esac esac
) || exit 1 ) || exit 1
[ "$stage" != "$top/$jar" ] && rm -rf "$stage" [ "$stage" != "$jar" ] && rm -rf "$stage"
true true
# vim:se ft=sh sts=4 sw=4 et: # vim:se ft=sh sts=4 sw=4 et: