diff options
author | Dave Chapman <dave@dchapman.com> | 2011-02-26 21:23:20 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2011-02-26 21:23:20 +0000 |
commit | eddf6247799d106cfeb26e19a4b5c909f36415b2 (patch) | |
tree | ef6ba1ed7911a0124e8df156965d776349c32440 | |
parent | f1e3f5e6c4fd511153937766c9c8034957df4f65 (diff) |
Clarify the condition for stripping the leading / in rbdir. The calculation of $app in the current code implies that this is not done for any call to buildzip.pl for application builds, but it is in fact only not done for the *install targets - $(MODELNAME) is quoted for the other calls in root.make, and hence $app is false.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29410 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/buildzip.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 6d25a01f8f..3c4410a172 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl @@ -681,10 +681,11 @@ $year+=1900; sub runone { my ($target, $fonts)=@_; - # in the app the the layout is different (no .rockbox, but bin/lib/share) $app = ($modelname eq "application"); - unless ($app) { - #rbdir starts with '/', strip it + + # Strip the leading / from $rbdir unless we are installing an application + # build - the layout is different (no .rockbox, but bin/lib/share) + unless ($app && $install) { $rbdir = substr($rbdir, 1); } |