[libreoffice] 01/01: also guard the cleanup phase of the l10ntools hack for en-US-only
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 5d45bcd9cab67d6ca66424aaa728535c8eccf857
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 14 20:22:27 2015 +0200
also guard the cleanup phase of the l10ntools hack for en-US-only
---
rules | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules b/rules
index f298bf5..3b98604 100755
--- a/rules
+++ b/rules
@@ -1950,10 +1950,10 @@ $(STAMP_DIR)/build-indep:
ifneq "$(BUILD_ISOS)" "en-US"
ifneq "$(JESSIE_BACKPORT)" "y"
- # FIXME: I have no f* ideal what breaks here. Maybe gcc5/libstdc++6 transition related?
+ifeq "$(ENABLE_HELP)" "y"
+ # FIXME: I have no f* idea what breaks here. Maybe gcc5/libstdc++6 transition related?
# Without this helpex gives loads of "parser errors" and the localized help is broken. Interestingly one needs
# all the three internally to fi^Wworkaround this
-ifeq "$(ENABLE_HELP)" "y"
$(MAKE) l10ntools.clean
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
./autogen.sh $(filter-out --with-system-boost,$(filter-out --with-system-icu,$(filter-out --with-system-expat,$(CONFIGURE_FLAGS)))) --disable-ccache --disable-collada --disable-ext-mariadb-connector --disable-firebird-sdbc
@@ -1987,6 +1987,7 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
endif
endif
+ifneq "$(BUILD_ISOS)" "en-US"
ifneq "$(JESSIE_BACKPORT)" "y"
ifeq "$(ENABLE_HELP)" "y"
# cleanup...
@@ -2003,6 +2004,7 @@ ifeq "$(ENABLE_HELP)" "y"
endif
endif
endif
+endif
touch $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: