pass FR_LIBRARY_PATH if it's already set

diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c
index 4192ac389e0b9415daec579b319fd4ecbfd89b14..54e805169e5cd153a8dcdad55b5263a9b971b35d 100644 (file)
--- a/scripts/jlibtool.c
+++ b/scripts/jlibtool.c
@@ -2253,7 +2253,11 @@ static int run_mode(command_t *cmd)
 #ifdef __APPLE__
                setenv("DYLD_FALLBACK_LIBRARY_PATH", l, 1);
 #endif
-               setenv("FR_LIBRARY_PATH", "./build/lib/local/.libs", 1);
+
+               l = getenv("FR_LIBRARY_PATH");
+               if (!l) l = "./build/lib/local/.libs";
+               setenv("FR_LIBRARY_PATH", l, 1);
+
                rv = run_command(cmd, cmd->arglist);
                if (rv) goto finish;
        }