diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2009-01-16 23:01:47 +0300 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2009-01-16 23:01:47 +0300 |
| commit | 2d5012700147458a58b36639cc9dfafdaacebe84 (patch) | |
| tree | 21e7a8f096a309af28c5d9f315113fc098e65d14 /main/Makefile.include | |
| parent | 88c104ca3f253178611dc58daf715fc4dd53e7c4 (diff) | |
* monodevelop-working/main/mdtool.in:
* monodevelop-working/main/monodevelop.in:
* monodevelop-working/main/Makefile.include: Remove pkgconfig sniffing,
since it's now unified in managed code.
* monodevelop-working/main/src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs:
Handle PKG_CONFIG_LIBDIR. If it's not set, sniff for the install
prefixes of MD, Mono and pkg-config and the associated pkgconfig
directories.
svn path=/trunk/monodevelop/; revision=123648
Diffstat (limited to 'main/Makefile.include')
| -rw-r--r-- | main/Makefile.include | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/Makefile.include b/main/Makefile.include index ebbc0b1d64..27b6bd6c9f 100644 --- a/main/Makefile.include +++ b/main/Makefile.include @@ -3,9 +3,6 @@ build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES) build_resources = $(addprefix $(srcdir)/, $(RES)) build_test_sources = $(addprefix $(srcdir)/, $(TESTFILES)) $(GENERATED_FILES) -### SYNCH BLOCK: any changes to this line should be kept in sync with the corresponding block in monodevelop.in and mdtool.in -MD_PKG_CONFIG_PATH=$(gtksharp_prefix)/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/$(shell if test -d /usr/lib64; then echo ":/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/"; fi) -### END BLOCK # workaroundfor lack of abs_top_builddir variable in automake < 1.10. Will break if mdtool isn't # launched from top_srcdir (i.e. where this script is located) @@ -16,7 +13,6 @@ MD_BIN_PATH=$(abs_top_builddir)/build/bin MD_LAUNCH_SETUP= \ MONODEVELOP_LOCALE_PATH=$(abs_top_builddir)/build/locale \ MONO_ADDINS_REGISTRY=$(MD_BIN_PATH) MOZILLA_FIVE_HOME=$(MOZILLA_HOME) \ - LD_LIBRARY_PATH=`echo "$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'` \ - PKG_CONFIG_PATH=`echo "$(PKG_CONFIG_PATH):$(MD_PKG_CONFIG_PATH)" | sed 's/^://g'` + LD_LIBRARY_PATH=`echo "$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'`d MDTOOL_RUN=$(MD_LAUNCH_SETUP) exec -a "mdtool" $(RUNTIME) --debug $(MD_BIN_PATH)/mdrun.exe |