From bc7ff53eab7341035d5128999576b5987eb2bbe8 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Mon, 25 Jun 2012 08:54:21 +0200
Subject: [PATCH] wpsbuild.pl: Fix FS#12706 - paths for backdrops and icons
 were not properly constructed.

Change-Id: I90b92241501f61e6b1de5305ff6482a9ddbdf722
---
 android/.classpath |  1 +
 wps/wpsbuild.pl    | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/.classpath b/android/.classpath
index 1b4b1eed7e..0ca188f976 100644
--- a/android/.classpath
+++ b/android/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
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();