From 0e9ca4668659ea6149bb5cb7b488dd9b75dc04d6 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Mon, 22 Mar 2010 17:24:03 +0100
Subject: [PATCH 1/2] ause117: #i110265# do check on flag file in output tree

---
 solenv/inc/settings.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 7e9ca7548c22..31fdb6ddd2d0 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -818,8 +818,8 @@ L10N_MODULE*=$(SOLARSRC)$/l10n
 ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
 
 .IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk
-.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
+.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
 
 # check for localizations not hosted in l10n module. if a file exists there
 # it won't in l10n

From 7dc9538972dcbdb570f724f5ec2a5c3ac780d5ef Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Mon, 29 Mar 2010 17:37:12 +0200
Subject: [PATCH 2/2] ause117: #i110472# define target java version

---
 solenv/config/sdev300.ini | 3 +++
 solenv/inc/settings.mk    | 2 ++
 solenv/inc/unxmacxi.mk    | 5 -----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 7fffd7eaca26..54e8e0605670 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -280,12 +280,14 @@ finish
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.4
 		}
 		jdk15
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.5
 		}
 		l10n
 		{
@@ -297,6 +299,7 @@ finish
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.6
 		}
 	}
 	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 31fdb6ddd2d0..5744103ed118 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -173,6 +173,8 @@ JAVARESPONSE=
 .ENDIF
 .ENDIF
 
+JAVAFLAGS+=$(JAVA_TARGET_FLAG)
+
 #END JAVA
 
 CDEFS=
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 6a21022d4830..7c7f0a88f4f4 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -49,10 +49,5 @@ CFLAGSENABLESYMBOLS=-g1
 CFLAGSENABLESYMBOLS=-g
 .ENDIF
 
-.IF "$(SNOW_LEOPARD_10_4)"!=""
-JAVACOMPILER+=-target 1.5
-.EXPORT: DYLD_INSERT_LIBRARIES
-.ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
-
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk