gnome-shell r27 - trunk/src

[otaylor svn gnome org]

Author: otaylor
Date: Mon Nov  3 20:41:25 2008
New Revision: 27
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=27&view=rev

Log:
Don't overwrite existing LD_LIBRARY_PATH when running g-ir-compiler

When running g-ir-compiler, augment LD_LIBRARY_PATH with the current
directory, rather than overwriting it entirely.


Modified:
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Nov  3 20:41:25 2008
@@ -48,4 +48,4 @@
 # The dependency on libgnome-shell.la here is because g-ir-compiler opens it
 # (not the fake library, since we've already done the rewriting)
 Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir
-	LD_LIBRARY_PATH=. g-ir-compiler Shell-0.1.gir -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@