[libreoffice] 01/02: set chromium-using archs centrally where also y/n is set

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit df5a547b524595a908488704fdfa98fa08998112
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 29 19:56:44 2016 +0100

    set chromium-using archs centrally where also y/n is set
---
 rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules b/rules
index 3a0923b..abeb060 100755
--- a/rules
+++ b/rules
@@ -437,13 +437,13 @@ LIBCMIS_MINVER=0.5.0
 endif
 ifeq "$(DEB_VENDOR)" "Debian"
   # chromium only available on i386/amd64...
+  ifeq "$(DEB_HOST_ARCH)" "i386"
+      ENABLE_GDRIVE=y
+  endif
   ifeq "$(DEB_HOST_ARCH)" "amd64"
     ENABLE_GDRIVE=y
-  else
-    ifeq "$(DEB_HOST_ARCH)" "i386"
-      ENABLE_GDRIVE=y
-    endif
   endif
+  OOO_GDRIVE_ARCHS += i386 amd64
 endif
 SYSTEM_STUFF += jpeg
 SYSTEM_STUFF += libxml
@@ -1240,7 +1240,7 @@ endif
 
 ifeq "$(ENABLE_GDRIVE)" "y"
   # Google API stuff for GDrive access
-  BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [i386 amd64]
+  BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [$(OOO_GDRIVE_ARCHS)]
   include /etc/chromium.d/apikeys
   CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLE_DEFAULT_CLIENT_ID) --with-gdrive-client-secret=$(GOOGLE_DEFAULT_CLIENT_SECRET)
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git