diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-06-25 08:54:21 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-06-25 08:54:21 +0200 |
commit | bc7ff53eab7341035d5128999576b5987eb2bbe8 (patch) | |
tree | 1f3ff1b6b8c74d0d3a2d920164c60c320838fce4 /wps | |
parent | 388014567fae75c9324d861986bd8e02a74301ba (diff) |
wpsbuild.pl: Fix FS#12706 - paths for backdrops and icons were not properly constructed.
Change-Id: I90b92241501f61e6b1de5305ff6482a9ddbdf722
Diffstat (limited to 'wps')
-rwxr-xr-x | wps/wpsbuild.pl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index ce4e0e9dd3..6df35df585 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl @@ -589,20 +589,19 @@ while(<WPS>) { # mangles some filenames if (defined($backdrop) && $backdrop ne "-") { copybackdrop(); - $backdrop = normalize($backdrop); + $backdrop = "$rbdir/" . normalize($backdrop); } foreach my $i ($iconset, $viewericon, $remoteiconset, $remoteviewericon) { if (defined($i) && $i ne "-") { copythemeicon($i); + $i = "$rbdir/$i"; } } - if (defined($font) && $font ne "-") { - copythemefont($font); - $font = "$rbdir/fonts/$font"; - } - if (defined($remotefont) && $remotefont ne "-") { - copythemefont($remotefont); - $remotefont = "$rbdir/fonts/$remotefont"; + foreach my $i ($font, $remotefont) { + if (defined($i) && $i ne "-") { + copythemefont($font); + $i = "$rbdir/fonts/$font"; + } } buildcfg(); copywps(); |