[libreoffice] 01/03: move --with-theme="$(DEFAULT_IMAGE)" setting from global CONFIGURE_FLAGS to the respective targets

Rene Engelhard rene at moszumanska.debian.org
Wed Jun 7 19:44:08 UTC 2017


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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 43e2cb4cfa9c245bf5af04029ed3cf4374298ea7
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Jun 7 19:40:02 2017 +0000

    move --with-theme="$(DEFAULT_IMAGE)" setting from global CONFIGURE_FLAGS to the respective targets
---
 rules | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules b/rules
index a369c01..2492178 100755
--- a/rules
+++ b/rules
@@ -547,8 +547,7 @@ CONFIGURE_FLAGS= \
 		--disable-fetch-external \
 		--without-fonts \
 		--without-myspell-dicts \
-		--with-branding=$(CURDIR)/debian/branding \
-		--with-theme="$(DEFAULT_IMAGE)"
+		--with-branding=$(CURDIR)/debian/branding
 
 ifeq "$(ENABLE_HELP)" "y"
 CONFIGURE_FLAGS_INDEP+= --with-help
@@ -1962,7 +1961,7 @@ $(STAMP_DIR)/build-arch:
 		--without-doxygen --without-javadoc --disable-ext-wiki-publisher \
 		--disable-report-builder --disable-scripting-javascript \
 		--disable-scripting-beanshell \
-		--with-galleries=no
+		--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
 
 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-non-l10n-only
 
@@ -2026,7 +2025,7 @@ endif
 		--without-doxygen --without-javadoc --disable-ext-wiki-publisher \
 		--disable-report-builder --disable-scripting-javascript \
 		--disable-scripting-beanshell \
-		--with-galleries=no
+		--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
 
 	# build the tests first
 	export gb_SUPPRESS_TESTS=true; \

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



More information about the Pkg-openoffice-commits mailing list