Permalink
Browse files

* 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
  • Loading branch information...
1 parent 3f26521 commit 641896289e47c212d700370d8bd00889d13228c1 @harinath harinath committed Jul 4, 2005
Showing with 13 additions and 3 deletions.
  1. +7 −0 ChangeLog
  2. +2 −2 mono-uninstalled.pc.in
  3. +4 −0 mono/tests/ChangeLog
  4. +0 −1 mono/tests/Makefile.am
View
@@ -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
View
@@ -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@
View
@@ -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.
View
@@ -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

0 comments on commit 6418962

Please sign in to comment.