diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2007-10-26 20:23:20 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2007-10-26 20:23:20 +0400 |
| commit | 93d53991d52e2706d991fb3632695486edf7a151 (patch) | |
| tree | b437504a5da6d011ab99a997cb0bc78b3947bf8e | |
| parent | b500a377b4b22e87e977219c8044c5af4e242c05 (diff) | |
2007-09-22 Michael Hutchinson <mhutchinson@novell.com>
* monodevelop.in: Add PKG_CONFIG_PATH values for lib64 if it exists,
so that packages will be found on openSUSE 10.3 x86_64.
* Makefile.am: Likewise. Also modify all of the run targets to set
PKG_CONFIG_PATH and other variables as required.
svn path=/trunk/monodevelop/; revision=88268
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rwxr-xr-x | monodevelop.in | 3 |
3 files changed, 26 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2007-09-22 Michael Hutchinson <mhutchinson@novell.com> + + * monodevelop.in: Add PKG_CONFIG_PATH values for lib64 if it exists, + so that packages will be found on openSUSE 10.3 x86_64. + * Makefile.am: Likewise. Also modify all of the run targets to set + PKG_CONFIG_PATH and other variables as required. + 2007-10-09 Ankit Jain <jankit@novell.com> * monodevelop.in: Discard wrapper script args before invoking diff --git a/Makefile.am b/Makefile.am index 500820a438..a028b81972 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,10 +71,20 @@ apidocs: cd docs/web/sources && mdassembler --out monodevelop-reference --ecma ../../api # cd docs/apiguide && mdassembler --out monodevelop-api-guide --xhtml toc.xhtml && mv monodevelop-api-guide.zip ../web/sources +### SYNCH BLOCK: any changes to this line should be kept in sync with the corresponding block in Makefile.am +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 + +MD_LAUNCH_SETUP= \ + cd build/bin && \ + MONO_ADDINS_REGISTRY=. 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'` + run: runmd runmd: $(PROGRAM) - cd build/bin && MONO_ADDINS_REGISTRY=. MOZILLA_FIVE_HOME=$(MOZILLA_HOME) LD_LIBRARY_PATH=`echo "$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'` $(RUNTIME) --debug MonoDevelop.exe + $(MD_LAUNCH_SETUP) $(RUNTIME) --debug MonoDevelop.exe pad: $(MONOPAD) @@ -82,10 +92,13 @@ runpad: $(MONOPAD) cd build/bin && mono MonoPad.exe run-profile: $(PROGRAM) - cd build/bin && mono -O=inline --profile MonoDevelop.exe + $(MD_LAUNCH_SETUP) $(RUNTIME) -O=inline --profile MonoDevelop.exe + +run-profile-stat: $(PROGRAM) + $(MD_LAUNCH_SETUP) $(RUNTIME) --profile=default:stat MonoDevelop.exe run-profile-heap: $(PROGRAM) - cd build/bin && mono -O=inline --profile=heap:heaplog MonoDevelop.exe + $(MD_LAUNCH_SETUP) $(RUNTIME) -O=inline --profile=heap:heaplog MonoDevelop.exe profile-pad: $(MONOPAD) cd build/bin && mono -O=inline --profile MonoPad.exe diff --git a/monodevelop.in b/monodevelop.in index cdd30a5a67..875bf3f2d7 100755 --- a/monodevelop.in +++ b/monodevelop.in @@ -60,7 +60,10 @@ else export LD_LIBRARY_PATH=$MOZILLA_HOME fi +### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.am MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/ +if test -d /usr/lib64; then MD_PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/; fi +### END BLOCK if [ -n $PKG_CONFIG_PATH ]; then export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$MD_PKG_CONFIG_PATH |