[ooo-build-commit] .: patches/dev300

René Engelhard rene at kemper.freedesktop.org
Tue Sep 28 10:01:36 PDT 2010


 patches/dev300/fields-table-formula.diff |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 6af6e103e59c90cd2463764b33f46aaa4c481166
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 28 18:58:55 2010 +0200

    fix ixion build on != UNX, use proper ./configure

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index a3c71cd..71be3b4 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -53,7 +53,7 @@ new file mode 100644
 index 0000000..c847995
 --- /dev/null
 +++ ixion/makefile.mk
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,59 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,8 +95,17 @@ index 0000000..c847995
 +TARFILE_NAME=ixion-0.2.0
 +TARFILE_MD5=0f63ee487fda8f21fafa767b3c447ac9
 +#PATCH_FILES=$(TARFILE_NAME).diff
++.IF "$(GUI)" != "UNX"
 +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 +BUILD_DIR=src$/libixion
++.ELSE
++CONFIGURE_DIR=
++CONFIGURE_ACTION=.$/configure
++CONFIGURE_FLAGS=--disable-shared
++BUILD_ACTION=$(GNUMAKE)
++BUILD_DIR=$(CONFIGURE_DIR)
++OUT2LIB+=src/libixion/.libs$/libixion*.a
++.ENDIF
 +
 +# --- Targets ------------------------------------------------------
 +


More information about the ooo-build-commit mailing list