From 9f82c1655709c5b813a3d90270bd6faa172e2577 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 27 Jun 2014 12:28:35 -0400 Subject: libnm-util: build nm-setting-docs.xml against uninstalled libnm-util Set GI_TYPELIB_PATH and LD_LIBRARY_PATH so that we build nm-setting-docs.xml against the just-built typelib and .so, not the installed ones. --- libnm-util/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libnm-util/Makefile.am') diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index c01dadc55d..eae7b5b064 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -189,7 +189,9 @@ if BUILD_SETTING_DOCS noinst_DATA = nm-setting-docs.xml nm-setting-docs.xml: generate-setting-docs.py NetworkManager-1.0.gir libnm-util.la - $(srcdir)/generate-setting-docs.py \ + export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + strace -o /tmp/strace.out $(srcdir)/generate-setting-docs.py \ --gir $(builddir)/NetworkManager-1.0.gir \ --output $@ -- cgit v1.2.1