Import Upstream version 0.4.2.3

1 files changed, 6 insertions, 0 deletions

diff --git a/binreloc.c b/binreloc.c
index 358445cd..1d1acfe6 100644
--- a/binreloc.c
+++ b/binreloc.c
@@ -21,6 +21,7 @@
 #include <limits.h>
 #include <string.h>
 #include "binreloc.h"
+#include "config.h"
 
 G_BEGIN_DECLS
 /** @internal
@@ -592,7 +593,12 @@ gchar *gbr_find_lib_dir(const gchar * default_lib_dir)
 	    return NULL;
     }
 
+#ifdef ARCH_x86_64
+    dir = g_build_filename(prefix, "lib64", NULL);
+#else
     dir = g_build_filename(prefix, "lib", NULL);
+#endif
+
     g_free(prefix);
     return dir;
 }