FUNCTIONS: waf_build --libdir=$PREFIX/lib (not lib64)

1 files changed, 6 insertions, 3 deletions

diff --git a/FUNCTIONS b/FUNCTIONS
index 978b8f7409..71bb7ca5df 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -546,15 +546,18 @@ function note_config_files() {
 # so check first if they are supported..
 
 function waf_build() {
-  local waf_opts="--prefix=$INSTALL_ROOT/usr"
+  local waf_opts="--prefix=$INSTALL_ROOT/usr" &&
   # Some waf not know man, waf angry with man.
   if ./waf --help | grep -q -- --mandir; then
     waf_opts="$waf_opts --mandir=$INSTALL_ROOT/usr/share/man"
-  fi
+  fi &&
   # Same with some other options.
+  if ./waf --help | grep -q -- --libdir; then
+    waf_opts="$waf_opts --libdir=$INSTALL_ROOT/usr/lib"
+  fi &&
   if ./waf --help | grep -q -- --nocache; then
     waf_opts="$waf_opts --nocache"
-  fi
+  fi &&
   if ./waf --help | grep -q -- --cxxflags=CXXFLAGS; then
     # Hack added for guitarix, maybe useful for others, too.
     # Needed to be able to enable C++11 mode. We hope to be able