[libreoffice] 03/04: Don't call get_libebook_dep.sh unconditionally
Rene Engelhard
rene at moszumanska.debian.org
Mon Jul 24 17:26:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 83e3e7590efa8d42c4ff26b2208f0b150384cb76
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date: Mon Jul 24 13:11:46 2017 +0200
Don't call get_libebook_dep.sh unconditionally
---
rules | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules b/rules
index de25b24..e705f81 100755
--- a/rules
+++ b/rules
@@ -1378,6 +1378,7 @@ ifeq "$(ENABLE_EVO2)" "n"
else
CONFIGURE_FLAGS += --enable-evolution2
BUILD_DEPS += , libebook1.2-dev
+ LIBEBOOK_DEP = $(shell debian/scripts/get_libebook_dep.sh)
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
@@ -3427,7 +3428,7 @@ endif
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
- -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
+ -V'libebook-dep=$(LIBEBOOK_DEP)' \
-V'libvlc-dep=$(LIBVLC_DEP)' \
-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
-V'pyuno-depends=$(PYUNO_DEPENDS)' \
--
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