From b3e3c2ce022eeae487664d0a6284fb52186d7742 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Jun 2014 01:45:13 +0200
Subject: [PATCH] Fix build

---
 OsmAnd/build.xml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index b43fed3eaa..02deb430e6 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -135,14 +135,30 @@
 	<target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
 		<!-- osmchange : Osmand plus support -->
 		<mkdir dir="${gen.absolute.dir}/net/osmand/plus"/>
-		<copy todir="${gen.absolute.dir}/net/osmand/plus">
-			<fileset dir="${gen.absolute.dir}/net/osmand">
-				<include name="R.java" />
-			</fileset>
-			<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
-				<include name="R.java" />
-			</fileset>
-		</copy>
+		<if>
+			<condition>
+				<isset property="net.osmand.sherpafy" />
+			</condition>
+			<then>
+			    <copy todir="${gen.absolute.dir}/net/osmand/plus">
+					<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
+						<include name="R.java" />
+					</fileset>
+				</copy>
+			</then>
+		</if>
+		<if>
+			<condition>
+				<isset property="net.osmand" />
+			</condition>
+			<then>
+			    <copy todir="${gen.absolute.dir}/net/osmand/plus">
+					<fileset dir="${gen.absolute.dir}/net/osmand">
+						<include name="R.java" />
+					</fileset>
+				</copy>
+			</then>
+		</if>
 		<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" />
 		<!-- osmchange : Osmand plus support -->