From: Michael Meeks <michael.meeks@novell.com>
Date: Tue, 29 Jun 2010 08:49:31 +0000 (+0100)
Subject: gudev: respect possibly given LD_LIBRARY_PATH
X-Git-Tag: 174~425
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a62b0cf285b3eb9d953c6224cce30d811bc1b0;p=systemd

gudev: respect possibly given LD_LIBRARY_PATH

michael@linux-iwk5:/opt/hgnome/src/udev> make V=1
make --no-print-directory all-recursive
Making all in .
PKG_CONFIG_PATH=./data:$PKG_CONFIG_PATH \
        LD_LIBRARY_PATH=./extras/gudev \
        /opt/hgnome/bin/g-ir-scanner -v \
                --namespace GUdev \
..
                ./extras/gudev/gudevdevice.c
/opt/hgnome/bin/python: error while loading shared libraries:
libpython2.5.so.1.0: cannot open shared object file: No such file or
directory
make[2]: *** [extras/gudev/GUdev-1.0.gir] Error 127
---

diff --git a/Makefile.am b/Makefile.am
index 8515e145..33ab56a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -381,7 +381,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud
 if ENABLE_INTROSPECTION
 extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
 	$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-	LD_LIBRARY_PATH=$(top_builddir)/extras/gudev \
+	LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \
 	$(G_IR_SCANNER) -v \
 		--namespace GUdev \
 		--nsversion=1.0 \