------------------------------------------------------------
revno: 1704
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Thu 2009-11-26 20:40:27 +0100
message:
- fix install on no-java builds
- add conditional for hppa build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-11-26 16:10:28 +0000
+++ b/changelog 2009-11-26 19:40:27 +0000
@@ -8,6 +8,8 @@
* debian/rules:
- enable l10n again (closes: #558030)
+ - fix install on no-Java builds
+ - add BUILD_HPPA conditional, don't enable it yet
* debian/scripts/vars.hppa: add
-- Rene Engelhard <r...@debian.org> Mon, 23 Nov 2009 21:27:01 +0100
=== modified file 'rules'
--- a/rules 2009-11-26 16:09:43 +0000
+++ b/rules 2009-11-26 19:40:27 +0000
@@ -83,6 +83,7 @@
BUILD_PPC64=y
BUILD_S390X=y
BUILD_SPARC=n
+BUILD_HPPA=n
PATCHSET=$(DIST)
BUILD_DEPS=
BUILD_PYUNO=y
@@ -390,6 +391,9 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_ARCHS += sparc
endif
+ifeq "$(BUILD_HPPA)" "y"
+ OOO_ARCHS += hppa
+endif
# Java...
OOO_JAVA_ARCHS = i386 powerpc mips mipsel s390 armel
ifeq "$(BUILD_AMD64)" "y"
@@ -483,6 +487,9 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_MOZILLA_ARCHS += sparc
endif
+ifeq "$(BUILD_HPPA)" "y"
+ OOO_MOZILLA_ARCHS += hppa
+endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
@@ -2168,6 +2175,7 @@
rmdir debian/ure/$(OOBRANDDIR)
# move URE Java stuff to /usr/share/java
mkdir -p debian/ure/usr/share/java/$(OODIRNAME)
+ifeq "$(ENABLE_JAVA)" "y"
mv debian/ure/$(OOUREDIR)/lib/JREProperties.class \
debian/ure/usr/share/java/$(OODIRNAME)
mv debian/ure/$(OOUREDIR)/share/java/* \
@@ -2178,6 +2186,7 @@
for i in
$(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/*.jar; do \
ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'`
`basename $$i`; \
done
+endif
# and the public libs to uno-libs3
mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
for i in debian/ure/$(OOUREDIR)/lib/libuno_*so.3; do \
