diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | mono-uninstalled.pc.in | 4 | ||||
| -rw-r--r-- | mono/tests/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/tests/Makefile.am | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 8338e067ce7..a60acbeedee 100644 --- 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 ec708398a9f..78269e3a963 100644 --- 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 96004fb9021..3e559f43819 100644 --- 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 d14b7a042a2..e5d98f0b41c 100644 --- 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 |