diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-13 16:03:29 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-13 16:05:27 -0400 |
| commit | ada09ae5027c16d75050bdfb70074e1e6ad880b6 (patch) | |
| tree | 5c669881776c626cf26641f202bf9c2492c8205a | |
| parent | 6c33ce32ec1b760ea7ab03e3cd49b80f088c8366 (diff) | |
| download | gobject-introspection-ada09ae5027c16d75050bdfb70074e1e6ad880b6.tar.gz | |
Prepend to $LD_LIBRARY_PATH not append
We want to extend $LD_LIBRARY_PATH from the front so that uninstalled
libraries take precedence over installed libraries.
http://bugzilla.gnome.org/show_bug.cgi?id=591740
| -rw-r--r-- | gir/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index 9d7d8ff5..ab8c2c87 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -205,7 +205,7 @@ girdir = $(GIR_DIR) dist_gir_DATA = $(GIRSOURCES) %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs:$(builddir)/.libs $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(GIRSOURCES:.gir=.typelib) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 3ed53201..9ad6ec39 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -143,10 +143,10 @@ post-check: @true %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir.check: %.tgir @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ |