ooo-build r13749 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Sep  1 19:29:45 2008
New Revision: 13749
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13749&view=rev

Log:
2008-09-01  Petr Mladek  <pmladek suse cz>

	* patches/dev300/build-java-target.diff: do not set the target
	  when calling the Eclipse java; I hope that it will work for
	  everybody now



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/build-java-target.diff

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Mon Sep  1 19:29:45 2008
@@ -122,7 +122,7 @@
 +.ENDIF
 +
 +.IF "$(ANT_JAVA_VER_FLAGS)"==""
-+.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
++.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
 +ANT_JAVA_VER_FLAGS=-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
 +.ENDIF
 +.ENDIF
@@ -166,7 +166,7 @@
  .IF "$(JAVACISGCJ)" == "yes"
  JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
  .ENDIF
-+.IF "$(JAVACISGCJ)" != "yes" && $(JAVACISKAFFE) != "yes"
++.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
 +JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
 +.ENDIF