config_host.mk.in | 2 ++ libmspub/makefile.mk | 6 ++---- libmspub/prj/build.lst | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 79f79847d0e217e461448d375767bd78aeda2bf7 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Thu May 24 14:41:20 2012 +0200 Fix libmspub build Change-Id: I24a1380ec61972a5c59f75a3c1f71552542bce7c diff --git a/config_host.mk.in b/config_host.mk.in index dcc8bc6..8a31f27 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -362,6 +362,8 @@ export MOZ_INC=@MOZ_INC@ export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@ export MOZ_LIB=@MOZ_LIB@ export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@ +export MSPUB_CFLAGS=@MSPUB_CFLAGS@ +export MSPUB_LIBS=@MSPUB_LIBS@ export MYSQL_DEFINES=@MYSQL_DEFINES@ export MYSQL_INC=@MYSQL_INC@ export MYSQL_LIB=@MYSQL_LIB@ diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk index e2e0877..f361adc 100644 --- a/libmspub/makefile.mk +++ b/libmspub/makefile.mk @@ -27,8 +27,8 @@ PRJ=. -PRJNAME=cdr -TARGET=cdr +PRJNAME=mspub +TARGET=mspub # --- Settings ----------------------------------------------------- @@ -62,8 +62,6 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/zlib TARFILE_NAME=libmspub-0.0.0 TARFILE_MD5=8b72793cbe6f152f51e476da053f03bc -#PATCH_FILES=\ - BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst index 151fbeb..05fb74e 100644 --- a/libmspub/prj/build.lst +++ b/libmspub/prj/build.lst @@ -1,3 +1,3 @@ -pub libmspub : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL -pub libmspub usr1 - all pub_mkout NULL -pub libmspub nmake - all pub_libmspub NULL +mspub libmspub : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL +mspub libmspub usr1 - all mspub_mkout NULL +mspub libmspub nmake - all mspub_libmspub NULL diff --git a/libmspub/prj/dmake b/libmspub/prj/dmake new file mode 100644 index 0000000..e69de29
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits