------------------------------------------------------------
revno: 1954
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2010-04-21 20:30:37 +0200
message:
another arch-indep depends fix
modified:
rules
=== modified file 'rules'
--- a/rules 2010-04-21 17:22:52 +0000
+++ b/rules 2010-04-21 18:30:37 +0000
@@ -879,7 +879,7 @@
# report-builder
ifeq "$(USE_SYSTEM_JFREEREPORT)" "y"
REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org
[$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)],
libxml-java-openoffice.org [$(OOO_JAVA_ARCHS)], libflute-java-openoffice.org
[$(OOO_JAVA_ARCHS)], libpentaho-reporting-flow-engine-java-openoffice.org
[$(OOO_JAVA_ARCHS)], liblayout-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libloader-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libformula-java-openoffice.org [$(OOO_JAVA_ARCHS)],
librepository-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libfonts-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libserializer-java-openoffice.org [$(OOO_JAVA_ARCHS)]
- REPORT_BUILDER_JAR_DEPENDS := $(shell $(REPORT_BUILDER_BUILD_DEPS) |
sed -e 's/\(.*\)\[.*\]/\1/')
+ REPORT_BUILDER_JAR_DEPENDS := , libbase-java-openoffice.org,
libsac-java, libxml-java-openoffice.org, libflute-java-openoffice.org,
libpentaho-reporting-flow-engine-java-openoffice.org,
liblayout-java-openoffice.org, libloader-java-openoffice.org,
libformula-java-openoffice.org, librepository-java-openoffice.org,
libfonts-java-openoffice.org, libserializer-java-openoffice.org
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport
--with-libbase-jar=/usr/share/java/openoffice/libbase.jar
--with-libxml-jar=/usr/share/java/openoffice/libxml.jar
--with-flute-jar=/usr/share/java/openoffice/flute.jar
--with-jfreereport-jar=/usr/share/java/openoffice/flow-engine.jar
--with-liblayout-jar=/usr/share/java/openoffice/liblayout.jar
--with-libloader-jar=/usr/share/java/openoffice/libloader.jar
--with-libformula-jar=/usr/share/java/openoffice/libformula.jar
--with-librepository-jar=/usr/share/java/openoffice/librepository.jar
--with-libfonts-jar=/usr/share/java/openoffice/libfonts.jar
--with-libserializer-jar=/usr/share/java/openoffice/libserializer.jar
endif
