summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2013-11-22 07:42:01 -0500
committerEric S. Raymond <esr@thyrsus.com>2013-11-22 07:42:01 -0500
commit4aa8ebbcdeff79733fbf380a2bddecd2b041ef88 (patch)
tree6fa64be8952ed183baf94d4f69c9276efde8a108
parent01f14e5e0457378a871be60d74f5843dae211346 (diff)
downloadgpsd-4aa8ebbcdeff79733fbf380a2bddecd2b041ef88.tar.gz
Avoid DESTDIR pollution in the build paths.
-rw-r--r--SConstruct6
1 files changed, 2 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 0141d99c..10a99901 100644
--- a/SConstruct
+++ b/SConstruct
@@ -285,10 +285,8 @@ def installdir(dir, add_destdir=True):
return wrapped
# Honor the specified installation prefix in link paths.
-if not env["sysroot"]:
- env.Prepend(LIBPATH=[installdir('libdir')])
-else:
- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+if env["sysroot"]:
+ env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
if env["shared"]:
env.Prepend(RPATH=[installdir('libdir')])