Author: raja
Date: 2005-07-04 07:00:26 -0400 (Mon, 04 Jul 2005)
New Revision: 46903
Modified:
trunk/mono/ChangeLog
trunk/mono/mono-uninstalled.pc.in
trunk/mono/mono/tests/ChangeLog
trunk/mono/mono/tests/Makefile.am
Log:
* Makefile.am (EXTRA_DIST): Distribute mono-uninstalled.pc.in.
(noinst_DATA): Build mono-uninstalled.pc.
* mono-uninstalled.pc.in (Libs): Avoid ${pc_top_builddir}.
(Cflags): Likewise. Let $(srcdir) to be absolute.
* mono/tests/Makefile.am (MKBUNDLE): Don't set PKG_CONFIG_TOP_BUILDDIR.
Avoids segfaults in pkg-config 0.18.1.
Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog 2005-07-04 10:17:05 UTC (rev 46902)
+++ trunk/mono/ChangeLog 2005-07-04 11:00:26 UTC (rev 46903)
@@ -1,3 +1,10 @@
+2005-07-04 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile.am (EXTRA_DIST): Distribute mono-uninstalled.pc.in.
+ (noinst_DATA): Build mono-uninstalled.pc.
+ * mono-uninstalled.pc.in (Libs): Avoid ${pc_top_builddir}.
+ (Cflags): Likewise. Let $(srcdir) to be absolute.
+
2005-07-03 Ben Maurer <[EMAIL PROTECTED]>
* scripts/Makefile.am (bin2_SCRIPTS): Add monop2
Modified: trunk/mono/mono/tests/ChangeLog
===================================================================
--- trunk/mono/mono/tests/ChangeLog 2005-07-04 10:17:05 UTC (rev 46902)
+++ trunk/mono/mono/tests/ChangeLog 2005-07-04 11:00:26 UTC (rev 46903)
@@ -1,3 +1,7 @@
+2005-07-04 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile.am (MKBUNDLE): Don't set PKG_CONFIG_TOP_BUILDDIR.
+
2005-07-01 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* remoting1.cs: Test for getting a remote field value which is null.
Modified: trunk/mono/mono/tests/Makefile.am
===================================================================
--- trunk/mono/mono/tests/Makefile.am 2005-07-04 10:17:05 UTC (rev 46902)
+++ trunk/mono/mono/tests/Makefile.am 2005-07-04 11:00:26 UTC (rev 46903)
@@ -15,7 +15,6 @@
RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
MKBUNDLE = \
- PKG_CONFIG_TOP_BUILD_DIR=$(top_builddir) \
PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
$(RUNTIME) $(mcs_topdir)/tools/mkbundle/mkbundle.exe
Modified: trunk/mono/mono-uninstalled.pc.in
===================================================================
--- trunk/mono/mono-uninstalled.pc.in 2005-07-04 10:17:05 UTC (rev 46902)
+++ trunk/mono/mono-uninstalled.pc.in 2005-07-04 11:00:26 UTC (rev 46903)
@@ -2,5 +2,5 @@
Description: Mono Runtime
Version: @VERSION@
Requires: glib-2.0 gmodule-2.0 gthread-2.0
-Libs: -L${pc_top_builddir}/mono/mini/.libs -lmono @libmono_ldflags@ -lm
-Cflags: -I${pc_top_builddir}/@srcdir@ -I${pc_top_builddir}/@srcdir@/mono
@libmono_cflags@
+Libs: [EMAIL PROTECTED]@/mono/mini/.libs -lmono @libmono_ldflags@ -lm
+Cflags: [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/mono @libmono_cflags@
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
