[gpsd-dev] [PATCH 2/3] always link against local libraries

[Mike Frysinger]

Linking against the local libraries should not depend on chrpath.  We
always want to search $PWD for static and shared so we can find things
via -lgpsd.

Signed-off-by: Mike Frysinger <address@hidden>
---
 SConstruct |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SConstruct b/SConstruct
index b7a98e4..0b3113f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -379,13 +379,13 @@ config = Configure(env, custom_tests = { 'CheckPKG' : 
CheckPKG,
                                          'CheckExecutable' : CheckExecutable,
                                          'CheckXsltproc' : CheckXsltproc})
 
+env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
 if config.CheckExecutable('$CHRPATH -v', 'chrpath'):
     # Tell generated binaries to look in the current directory for
     # shared libraries so we can run tests without hassle. Should be
     # handled sanely by scons on all systems.  Not good to use '.' or
     # a relative path here; it's a security risk.  At install time we
     # use chrpath to edit this out of RPATH.
-    env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
     if env["shared"]:
         env.Prepend(RPATH=[os.path.realpath(os.curdir)])
 else:
-- 
1.7.6.1