[gjs] build: Use uninstalled library paths



commit 2649a2ec2a37ad2a48e5107e06ee47d23f17acb3
Author: Philip Chimento <philip endlessm com>
Date:   Mon Dec 12 11:34:37 2016 -0800

    build: Use uninstalled library paths
    
    Continuation of previous commit; needed in case there were any values
    already given in GI_TYPELIB_PATH. Also need to specify LD_LIBRARY_PATH to
    pick up uninstalled libgjs if applicable.
    
    Unreviewed.

 Makefile-test.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index 03bb8da..e26d078 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -281,7 +281,8 @@ AM_TESTS_ENVIRONMENT =                                      \
        export GJS_USE_UNINSTALLED_FILES=1;             \
        export GJS_TEST_SKIP="$(SKIPPED_TESTS)";        \
        export GJS_PATH=;                               \
-       export GI_TYPELIB_PATH="$(builddir)";           \
+       export GI_TYPELIB_PATH="$(builddir):$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}"; \
+       export LD_LIBRARY_PATH="$(builddir)/.libs:$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"; \
        export G_FILENAME_ENCODING=latin1;              \
        $(XVFB_START)                                   \
        $(NULL)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]