From: Johan Bilien Date: Tue, 16 Jun 2009 17:41:29 +0000 (+0100) Subject: Make sure the scanner and compiler are able to find libeverything.so.1 X-Git-Tag: GOBJECT_INTROSPECTION_0_6_3~5 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=511076d331a521a96218d5358f3f5ed58bffcb14;p=gnome.gobject-introspection Make sure the scanner and compiler are able to find libeverything.so.1 and that it uses the uninstalled version. Fixes make check (when libeverything.so.1 was uninstalled). --- diff --git a/gir/Makefile.am b/gir/Makefile.am index eece8ec..9d7d8ff 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -183,7 +183,7 @@ libgirepository_everything_1_0_la_LDFLAGS += -no-undefined endif Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS) - $(CHECK_DEBUG) $(SCANNER) \ + LPATH=$(builddir)/.libs $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ --libtool="$(SHAVE_SAVED_LIBTOOL)" \ --library=girepository-everything-1.0 \ @@ -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 $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ + 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 $@ typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(GIRSOURCES:.gir=.typelib)