./packages/openofficeorg/3.0/experimental r1200: we need exactly one --with-additional-sections call
------------------------------------------------------------
revno: 1200
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2008-07-30 16:50:24 +0200
message:
we need exactly one --with-additional-sections call
modified:
rules
=== modified file 'rules'
--- a/rules 2008-07-30 14:17:40 +0000
+++ b/rules 2008-07-30 14:50:24 +0000
@@ -209,7 +209,8 @@
--with-external-dict-dir=/usr/share/myspell/dicts \
--with-external-hyph-dir=/usr/share/myspell/dicts \
--with-external-thes-dir=/usr/share/myspell/dicts \
- --with-split
+ --with-split \
+ --with-additional-sections="$(ADDITIONAL_SECTIONS)"
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -619,7 +620,7 @@
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-apache-commons --with-commons-codec-jar=/usr/share/java/commons-codec.jar --with-commons-lang-jar=/usr/share/java/commons-lang.jar --with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar --with-commons-logging-jar=/usr/share/java/commons-logging.jar
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
- CONFIGURE_FLAGS += --with-additional-sections="DebianBaseSystemApacheCommons"
+ ADDITIONAL_SECTIONS += DebianBaseSystemApacheCommons
endif
else
CONFIGURE_FLAGS += --disable-mediawiki
@@ -631,7 +632,7 @@
REPORT_BUILDER_JAR_DEPENDS := $(REPORT_BUILDER_BUILD_DEPS)
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport --with-jcommon-jar=/usr/share/java/jcommon.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute-1.3-jfree.jar --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-jcommon-serializer-jar=/usr/share/java/jcommon-serializer.jar
- CONFIGURE_FLAGS += --with-additional-sections="DebianBaseSystemJFreeReport"
+ ADDITIONAL_SECTIONS += DebianBaseSystemJFreeReport
endif
else
CONFIGURE_FLAGS += --disable-reportdesign
@@ -797,7 +798,7 @@
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
endif
ifeq "$(KDE_VER)" "4"
- CONFIGURE_FLAGS += --with-additional-sections="KDE4"
+ ADDITIONAL_SECTIONS += KDE4
endif
ifeq "$(ENABLE_KDEAB)" "y"
ifeq "$(KDE_VER)" "4"
@@ -842,7 +843,7 @@
BUILD_DEPS += , liblucene2-java (>= 2.3.2+ds1-2)
LUCENE_DEPENDS = liblucene2-java (>= 2.3.2+ds1-2)
CONFIGURE_FLAGS += --with-system-lucene --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
- CONFIGURE_FLAGS += --with-additional-sections="DebianBaseSystemLucene"
+ ADDITIONAL_SECTIONS += DebianBaseSystemLucene
endif
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
BUILD_DEPS += , libhsqldb-java (>= 1.8.0.9-1) [$(OOO_JAVA_ARCHS)]
Reply to: