./packages/openofficeorg/3.1/experimental r1415: - only specify --with-lang= when we don't only build en-US. en-US is
------------------------------------------------------------
revno: 1415
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-02-25 18:24:46 +0100
message:
- only specify --with-lang= when we don't only build en-US. en-US is
default anyway and not specifying --with-lang=en-US afais speeds up the
en-US only build even more
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-02-25 14:25:11 +0000
+++ b/changelog 2009-02-25 17:24:46 +0000
@@ -36,6 +36,9 @@
- remove -unbundled conflict when VER = "" because upstreams packages
now are called openoffice.orgX-*.
- tighten hsqldb depends to 1.8.0.10 with the lock fix
+ - only specify --with-lang= when we don't only build en-US. en-US is
+ default anyway and not specifying --with-lang=en-US afais speeds up the
+ en-US only build even more
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
=== modified file 'rules'
--- a/rules 2009-02-25 14:25:11 +0000
+++ b/rules 2009-02-25 17:24:46 +0000
@@ -231,7 +231,6 @@
--with-installed-ooo-dirname=$(OODIRNAME) \
--mandir=/usr/share/man \
--with-docdir=/usr/share/doc/openoffice.org \
- --with-lang="$(BUILD_ISOS)" \
--with-build-version="openoffice.org$(VER)-core $(BINARY_VERSION), `LC_ALL=C date`" \
--disable-strip \
--enable-lockdown \
@@ -244,6 +243,14 @@
--with-external-thes-dir=/usr/share/myspell/dicts \
--with-additional-sections="$(ADDITIONAL_SECTIONS)"
+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
Reply to: