[libreoffice] 02/03: fix autogen.sh for autopkgtests by exporting the needed env vars there, too
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 81ac10e79a03476f00d48f0219b0f083f49949b6
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 21 19:39:53 2015 +0200
fix autogen.sh for autopkgtests by exporting the needed env vars there, too
---
changelog | 2 ++
rules | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index bd358e9..ea73b11 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
- add explicit dh-python build-dependency
- temporarily disable -kde (KDE uninstallable in sid right now
anyway) and coinmp
+ - fix autogen.sh for autopkgtests by exporting the needed env vars there,
+ too
* merge from Ubuntu:
- autopkgtest updates/fixes
diff --git a/rules b/rules
index c6bc398..e025e6c 100755
--- a/rules
+++ b/rules
@@ -1878,7 +1878,12 @@ endif
.PHONY: config_host.mk
config_host.mk:
rm -f config.status autogen.lastrun
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
+ OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
+ COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
+ ./autogen.sh $(CONFIGURE_FLAGS)
build:
$(CURDIR)/debian/rules build-arch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: