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/mdtool.in | |
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/mdtool.in')
-rw-r--r-- | main/mdtool.in | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/main/mdtool.in b/main/mdtool.in index c1e7a4085c..65c05a2426 100644 --- a/main/mdtool.in +++ b/main/mdtool.in @@ -5,28 +5,6 @@ PREFIX="${0%%/mdtool}/.." MD_FORCE_DEBUG=yes -### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.include and monodevelop.in -MONO_PREFIX=`which mono` -MONO_PREFIX="${MONO_PREFIX%%/mono}/.." -PKGCONFIG_PREFIX=`which pkg-config` -PKGCONFIG_PREFIX="${PKGCONFIG_PREFIX%%/pkg-config}/.." - -MD_PKG_CONFIG_PATH="" -for D in "$PREFIX/.." "$MONO_PREFIX" "$PKGCONFIG_PREFIX" '/usr/local' '/usr'; do - for PKGDIR in "$D/lib/pkgconfig" "$D/lib64/pkgconfig" "$D/share/pkgconfig"; do - if [ -d "$PKGDIR" ]; then MD_PKG_CONFIG_PATH="$MD_PKG_CONFIG_PATH:$PKGDIR"; fi - done -done -### END BLOCK - -if [ -n $PKG_CONFIG_PATH ]; then - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$MD_PKG_CONFIG_PATH -else - export PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH -fi - -ARGS="" - for arg in $*; do case x$arg in x--profile*) |