[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ef18f0ce52694e60cf6c06c4ba674563caef6fd3
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 20:56:17 2010 +0000

            Tiger build fix.
    
            * java/Makefile: I can't get $(or ...) work on Tiger, so changed to use a single condition.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e8ac022..3512d8e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,11 @@
 2010-02-25  Alexey Proskuryakov  <ap at apple.com>
 
+        Tiger build fix.
+
+        * java/Makefile: I can't get $(or ...) work on Tiger, so changed to use a single condition.
+
+2010-02-25  Alexey Proskuryakov  <ap at apple.com>
+
         Reviewed by Geoffrey Garen.
 
         https://bugs.webkit.org/show_bug.cgi?id=35394
diff --git a/LayoutTests/java/Makefile b/LayoutTests/java/Makefile
index 5f48bc4..6f27a16 100644
--- a/LayoutTests/java/Makefile
+++ b/LayoutTests/java/Makefile
@@ -24,15 +24,15 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 ifeq ($(findstring 10.4, $(shell sw_vers -productVersion)), 10.4)
-	BUILDING_ON_TIGER = 1
+	USE_NORMAL_PLUGIN_JAR_PATH = 1
 endif
 
 ifeq ($(findstring 10.5, $(shell sw_vers -productVersion)), 10.5)
-	BUILDING_ON_LEOPARD = 1
+	USE_NORMAL_PLUGIN_JAR_PATH = 1
 endif
 
 JC = javac
-ifeq ($(or $(BUILDING_ON_TIGER), $(BUILDING_ON_LEOPARD)), 1)
+ifeq ($(USE_NORMAL_PLUGIN_JAR_PATH), 1)
 	CLASSPATH = /System/Library/Frameworks/JavaVM.framework/Home/lib/plugin.jar
 else
 	# The above path works on Tiger and Leopard, but is a broken link on SnowLeopard, <rdar://7578937>.

-- 
WebKit Debian packaging