* 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.

svn path=/trunk/mono/; revision=46903

diff --git a/ChangeLog b/ChangeLog
index 8338e067ce7681151ace2de4125829cc87797de4..a60acbeedee7ad2aeaa0a355bfe36f08a1fd37e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-04  Raja R Harinath  <rharinath@novell.com>
+
+       * 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  <bmaurer@ximian.com>
 
        * scripts/Makefile.am (bin2_SCRIPTS): Add monop2

diff --git a/mono-uninstalled.pc.in b/mono-uninstalled.pc.in
index ec708398a9fb62aafcb82bff5f7f0853d1f58820..78269e3a9636e9a17eee37722cd27db83af7165b 100644 (file)
--- a/mono-uninstalled.pc.in
+++ b/mono-uninstalled.pc.in
@@ -2,5 +2,5 @@ Name: Mono
 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: -L@mono_build_root@/mono/mini/.libs -lmono @libmono_ldflags@ -lm
+Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/mono @libmono_cflags@

diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index 96004fb9021a04a59baa3a78c3ca8ea3a096205e..3e559f438195224f554310f0255df82c782c1fec 100644 (file)
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-04  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile.am (MKBUNDLE): Don't set PKG_CONFIG_TOP_BUILDDIR.
+
 2005-07-01  Lluis Sanchez Gual  <lluis@novell.com>
 
        * remoting1.cs: Test for getting a remote field value which is null.

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index d14b7a042a2a108cb953611ae800fe26db14c4b9..e5d98f0b41ca2eba25dca955471a07d38523e25a 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -15,7 +15,6 @@ with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/default
 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