PATCH: minor fixes
Rene, all.
Please review the attached patch to be pushed.
First chunk fixes the output of dirname when libgcj10-awt is installed:
$ dpkg -L libgcj10-awt | grep libjawt.so
/usr/lib/gcj-4.4-10/libjawt.so
/usr/lib/jvm/java-1.5.0-gcj-4.4/lib/libjawt.so
The second one just removes ooo-build directory before "git clone"
(otherwise it fails when the directory exists).
--
Best regards,
Rail Aliev
=== modified file 'rules'
--- rules 2009-08-29 17:11:33 +0000
+++ rules 2009-08-30 10:38:05 +0000
@@ -678,7 +678,7 @@
JAVA_RUNTIME_DEPENDS += | java5-runtime
# Suns Java "packages"
JAVA_RUNTIME_DEPENDS += | jre
- GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so`)
+ GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
@@ -3388,6 +3388,7 @@
# Get ooo-build
get-ooo-build:
+ rm -rf ooo-build
git clone git://anongit.freedesktop.org/git/ooo-build/ooo-build
ifneq "$(OOO_BUILD_BRANCH)" ""
cd ooo-build && \
Reply to: