summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2010-09-25 14:47:11 +0000
committerTeruaki Kawashima <teru@rockbox.org>2010-09-25 14:47:11 +0000
commit3c11c56dc479b51ff659a4275541fca32875985d (patch)
tree678a61a3f2835cc7c77ce972aad3bb582bd2d861 /tools
parent6a9cabc4349238c6c7fddb9828b4c5f3f8099277 (diff)
downloadrockbox-3c11c56dc479b51ff659a4275541fca32875985d.tar.gz
rockbox-3c11c56dc479b51ff659a4275541fca32875985d.tar.bz2
rockbox-3c11c56dc479b51ff659a4275541fca32875985d.zip
fix FS#11596. make "make install" use rbdir. copy image file correctly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28160 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildzip.pl12
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index e299d7c02a..fe0bd591e4 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -119,14 +119,14 @@ sub make_install {
$userdir .= "/share/rockbox";
} else {
# for non-app builds we expect the prefix to be the dir above .rockbox
- $bindir .= "/.rockbox";
+ $bindir .= "/$rbdir";
$libdir = $userdir = $bindir;
}
if ($dest =~ /\/dev\/null/) {
die "ERROR: No PREFIX given\n"
}
- if ((!$app) && $src && (abs_path($dest) eq abs_path($src))) {
+ if ((!$app) && $src && (abs_path($bindir) eq abs_path($src))) {
return 1;
}
@@ -663,12 +663,14 @@ sub runone {
}
if($target && ($target !~ /(mod|ajz|wma)\z/i)) {
# On some targets, the image goes into .rockbox.
- copy("$target", "$rbdir/$target");
+ copy("$target", ".rockbox/$target");
undef $target;
}
if($install) {
make_install(".rockbox", $install) or die "MKDIRFAILED\n";
+ rmtree(".rockbox");
+ print "rm .rockbox\n" if $verbose;
}
else {
unless (".rockbox" eq $rbdir) {
@@ -679,9 +681,9 @@ sub runone {
}
system("$ziptool $output $rbdir $target >/dev/null");
print "$ziptool $output $rbdir $target >/dev/null\n" if $verbose;
+ rmtree("$rbdir");
+ print "rm $rbdir\n" if $verbose;
}
- rmtree(".rockbox");
- print "rm .rockbox\n" if $verbose;
};
if(!$exe) {