[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-2-1-gda3223b



The following commit has been merged in the master branch:
commit da3223b0d593a58c54f35c5c55750d7be7b482b8
Author: Rene Engelhard <rene@rene-engelhard.de>
Date:   Wed Jun 19 21:41:01 2013 +0200

    simplify, use findstring (as already in 4.1 branch..)

diff --git a/rules b/rules
index af86b10..6c99439 100755
--- a/rules
+++ b/rules
@@ -813,10 +813,7 @@ ifeq "$(ENABLE_JAVA)" "y"
       # no 7 on mips(el)
       ifneq (,$(findstring mips,$(OOO_JAVA_ARCHS)))
 	BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel]
-        ifeq "$(DEB_HOST_ARCH)" "mips"
-          JAVA_MAINVER=6
-        endif
-        ifeq "$(DEB_HOST_ARCH)" "mipsel"
+        ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
           JAVA_MAINVER=6
         endif
       endif

-- 
LibreOffice packaging repository


Reply to: