Fail noisily when chrpath=yes but chrpath is not available.

1 files changed, 3 insertions, 3 deletions

diff --git a/SConstruct b/SConstruct
index 1369ce13..fadbe94a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -481,8 +481,8 @@ else:
 
 
     env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
-    if env["shared"]:
-        if env["chrpath"] and config.CheckExecutable('chrpath -v', 'chrpath'):
+    if env["shared"] and env["chrpath"]:
+        if config.CheckExecutable('chrpath -v', 'chrpath'):
             # Tell generated binaries to look in the current directory for
             # shared libraries so we can run regression tests without
             # hassle. Should be handled sanely by scons on all systems.  Not
@@ -490,7 +490,7 @@ else:
             # At install time we use chrpath to edit this out of RPATH.
             env.Prepend(RPATH=[os.path.realpath(os.curdir)])
         else:
-            print "chrpath is not available or use of it has been disabled."
+            print "chrpath is not available; please build with chrpath=no."
 
     confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]