diff options
| author | Rene Engelhard <rene@debian.org> | 2008-04-30 22:42:12 +0000 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2008-04-30 22:42:12 +0000 |
| commit | cd0821c64b09f0e44d2ca3ba279efb16df66992d (patch) | |
| tree | e966e110565b18821875b95e8195bbb38cd02caf /Makefile.shared | |
| parent | 1d1f60cfca7f924d77f6a757e756c666b6b0aa5d (diff) | |
Fix to build
* patches/dev300/apply,
patches/dev300/debian-system-apache-commons.diff:
(DebianBaseOnly) set Class-Path to the system libs and don't
pack the apache-commons jars into the oxt
* patches/dev300/wiki-publisher-no-license.diff: fix to build
* bin/unpack: unpack swext-$CVSTAG.tar.gz when
--disable-mediawiki not specified.
* patches/dev300/apply: reenable above, move into own
swextFixes enabled by below
* Makefile.shared: add extra swext distro when swext directory exists
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.shared b/Makefile.shared index 9c5cf087b..901ea0729 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -25,6 +25,9 @@ $(OOBUILDDIR)/unpack : if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ FLAGS="$$FLAGS --distro=Localize"; \ fi ; \ + if test -d $(OOBUILDDIR)/swext ; then \ + FLAGS="$$FLAGS --distro=swext"; \ + fi ; \ if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \ FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \ fi ; \ @@ -88,6 +91,9 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ if test $(OOO_LANGS) != en-US ; then \ FLAGS="$$FLAGS --distro=Localize"; \ fi ; \ + if test -d $(OOBUILDDIR)/swext ; then \ + FLAGS="$$FLAGS --distro=swext"; \ + fi ; \ if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \ FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \ fi ; \ @@ -112,6 +118,9 @@ patch.unapply: if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ FLAGS="$$FLAGS --distro=Localize"; \ fi ; \ + if test -d $(OOBUILDDIR)/swext ; then \ + FLAGS="$$FLAGS --distro=swext"; \ + fi ; \ if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \ FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \ fi ; \ |