------------------------------------------------------------
revno: 1871
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-03-19 11:35:52 +0100
message:
fix some arch-indep builds (without mono for example)
modified:
rules
=== modified file 'rules'
--- a/rules 2010-03-18 22:53:03 +0000
+++ b/rules 2010-03-19 10:35:52 +0000
@@ -906,6 +906,7 @@
DBG_DBG_SUGGESTS += , mono-jit-dbg [$(OOO_MONO_ARCHS)], libmono0-dbg
[$(OOO_MONO_ARCHS)], mono-dbg [$(OOO_MONO_ARCHS)]
else
CONFIGURE_FLAGS+= --disable-mono
+ DEBHELPER_OPTIONS += -Nlibuno-cli-basetypes1.0-cil
-Nlibuno-cli-uretypes1.0-cil -Nlibuno-cli-oootypes1.0-cil
-Nlibuno-cli-cppuhelper1.0-cil -Nlibuno-cli-ure1.0-cil
endif
ifeq "$(USE_SYSTEM_HUNSPELL)" "y"
@@ -3171,8 +3172,11 @@
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README
# URE got moved to /usr/lib, so this is obsolete
- rmdir $(PKGDIR)-common/$(OOBRANDDIR)/ure/lib
- rmdir $(PKGDIR)-common/$(OOBRANDDIR)/ure
+ for i in ure/lib ure; do \
+ if [ -e $(PKGDIR)-common/$(OOBRANDDIR)/$$i ]; then \
+ rmdir $(PKGDIR)-common/$(OOBRANDDIR)/$$i; \
+ fi; \
+ done
# install ooo-build desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
