./packages/openofficeorg/3.2/experimental r1643: fix --with-lang= passing to configure. Don't do it when we build only en-US
------------------------------------------------------------
revno: 1643
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-09-06 21:11:07 +0200
message:
fix --with-lang= passing to configure. Don't do it when we build only en-US
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-09-04 20:11:46 +0000
+++ b/changelog 2009-09-06 19:11:07 +0000
@@ -20,11 +20,13 @@
- enable graphite; it's now upstream; don't use system-graphite on i386
for now
- bump libnss3-dev build-deps to >= 3.12.3
+ - fix --with-lang= passing to configure. Don't do it when we build only
+ en-US
* debian/control.mediawiki.in:
- we don't need a strict depends on lucene anymore, remove it again.
Bump dependencies to >= 1:3.0.0~ matching description.xml
- -- Rene Engelhard <rene@debian.org> Thu, 03 Sep 2009 23:37:23 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Sep 2009 20:19:28 +0200
openoffice.org (1:3.1.1-2) UNRELEASED; urgency=low
=== modified file 'rules'
--- a/rules 2009-09-04 20:11:46 +0000
+++ b/rules 2009-09-06 19:11:07 +0000
@@ -271,14 +271,6 @@
--with-additional-sections="$(ADDITIONAL_SECTIONS)" \
--without-git
-ifneq "$(BUILD_ONLY_EN_US)" "y"
- CONFIGURE_FLAGS += --with-lang="$(BUILD_ISOS)"
-else
- ifneq "$(BUILD_ISOS)" "en-US"
- CONFIGURE_FLAGS += --with-lang="$(BUILD_ISOS)"
- endif
-endif
-
ifneq "$(WITH_SPLIT)" "y"
CONFIGURE_FLAGS += --without-split
endif
@@ -618,6 +610,12 @@
endif
BUILD_ISOS = $(ISOS)
+ifneq "$(BUILD_ONLY_EN_US)" "y"
+ ifneq "$(BUILD_ISOS)" "en-US"
+ CONFIGURE_FLAGS += --with-lang="$(BUILD_ISOS)"
+ endif
+endif
+
ifeq "$(VER)" ""
CONFIGURE_FLAGS += --with-binsuffix=no
else
Reply to: