summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-11-26 09:36:34 +0000
committerNils Wallménius <nils@rockbox.org>2008-11-26 09:36:34 +0000
commit28f06901f74d8574ea0de00a143cbda08326d9f7 (patch)
tree64f8d6218ec6f6f977305c6a041221de03b932cc
parentf4eb4822021d84746660389eefc9555a069f9e86 (diff)
downloadrockbox-28f06901f74d8574ea0de00a143cbda08326d9f7.tar.gz
rockbox-28f06901f74d8574ea0de00a143cbda08326d9f7.tar.bz2
rockbox-28f06901f74d8574ea0de00a143cbda08326d9f7.zip
Accept FS#9579 by Bartosz Fabianowski, fixing make zip when your build dir is not inside the source tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19223 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS2
-rwxr-xr-xwps/wpsbuild.pl2
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 128bdf61cc..74d4289766 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -432,6 +432,8 @@ Marcin Łukasik
Le Jin
Alex Bennee
Stéphane Quertinmont
+Bartosz Fabianowski
+
The libmad team
The wavpack team
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 4a27325e35..bb229dfebf 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -13,7 +13,6 @@ use Getopt::Long qw(:config pass_through); # pass_through so not confused by -DT
my $ROOT="..";
my $verbose;
-my $firmdir="$ROOT/firmware";
my $rbdir=".rockbox";
my $wpslist;
my $target;
@@ -26,6 +25,7 @@ GetOptions ( 'r|root=s' => \$ROOT,
($wpslist, $target) = @ARGV;
+my $firmdir="$ROOT/firmware";
my $cppdef = $target;
my @depthlist = ( 16, 8, 4, 2, 1 );