You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2011/11/23 02:34:54 UTC
svn commit: r1205258 - in /incubator/ooo/trunk/main/mythes: makefile.mk
mythes-1.2.0-disable-example.patch
Author: pfg
Date: Wed Nov 23 01:34:53 2011
New Revision: 1205258
URL: http://svn.apache.org/viewvc?rev=1205258&view=rev
Log:
Fix mythes build with BSD make. Thanks to Ariel for his assistance.
Modified:
incubator/ooo/trunk/main/mythes/makefile.mk
incubator/ooo/trunk/main/mythes/mythes-1.2.0-disable-example.patch
Modified: incubator/ooo/trunk/main/mythes/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/mythes/makefile.mk?rev=1205258&r1=1205257&r2=1205258&view=diff
==============================================================================
--- incubator/ooo/trunk/main/mythes/makefile.mk (original)
+++ incubator/ooo/trunk/main/mythes/makefile.mk Wed Nov 23 01:34:53 2011
@@ -84,7 +84,7 @@ OUT2INC += mythes.hxx
CONFIGURE_ACTION=configure
CONFIGURE_FLAGS= --disable-shared --with-pic
-BUILD_ACTION=make
+BUILD_ACTION=gmake
.ELSE
BUILD_ACTION=dmake
Modified: incubator/ooo/trunk/main/mythes/mythes-1.2.0-disable-example.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/mythes/mythes-1.2.0-disable-example.patch?rev=1205258&r1=1205257&r2=1205258&view=diff
==============================================================================
--- incubator/ooo/trunk/main/mythes/mythes-1.2.0-disable-example.patch (original)
+++ incubator/ooo/trunk/main/mythes/mythes-1.2.0-disable-example.patch Wed Nov 23 01:34:53 2011
@@ -67,25 +67,13 @@ diff -uNrp misc/build/mythes-1.2.0/confi
diff -uNrp misc/build/mythes-1.2.0/Makefile.in misc/mythes-1.2.0/Makefile.in
--- misc/build/mythes-1.2.0/Makefile.in 2010-02-27 12:57:35.000000000 -0300
-+++ misc/mythes-1.2.0/Makefile.in 2011-11-21 10:48:03.713435791 -0300
-@@ -18,7 +18,7 @@
-
-
-
--
-+ENABLE_EXAMPLE=@ENABLE_EXAMPLE@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -85,7 +85,11 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
- libmythes_1_2_la_LIBADD =
- am_libmythes_1_2_la_OBJECTS = mythes.lo
- libmythes_1_2_la_OBJECTS = $(am_libmythes_1_2_la_OBJECTS)
-+ifeq "$(ENABLE_EXAMPLE)" "no"
-+PROGRAMS=
-+else
- PROGRAMS = $(noinst_PROGRAMS)
-+endif
- am_example_OBJECTS = example.$(OBJEXT)
- example_OBJECTS = $(am_example_OBJECTS)
- example_DEPENDENCIES = libmythes-1.2.la
++++ misc/mythes-1.2.0/Makefile.in 2011-11-22 20:39:45.589038536 -0300
+@@ -675,7 +675,7 @@ distcleancheck: distclean
+ exit 1; } >&2
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
+ $(HEADERS) config.h
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfdir)" "$(DESTDIR)$(libmythes_1_2_includedir)"; do \