diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2013-08-23 03:28:17 -0700 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2013-08-23 03:28:17 -0700 |
| commit | 74684879fb699149f6b33c67388be8ca0a3226f7 (patch) | |
| tree | cd7b05439e569d2825f4a54461e646a778ca89a3 | |
| parent | 49e980d5a328ce560f046eec5f372d2deb0e5bdd (diff) | |
| parent | e84c7d825739db4e24c1bef107c1c234f6e37efd (diff) | |
Merge pull request #14 from hasufell/master
imrove LIBDIR detection in binreloc
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | hardinfo/binreloc.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config.h.cmake b/config.h.cmake index 455da69a..1621a890 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -10,6 +10,7 @@ #define HOSTNAME "" #define ARCH_@HARDINFO_ARCH@ +#define LIBDIR "@CMAKE_INSTALL_LIBDIR@" #define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo" #define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo" diff --git a/hardinfo/binreloc.c b/hardinfo/binreloc.c index 1d1acfe6..f47a3fae 100644 --- a/hardinfo/binreloc.c +++ b/hardinfo/binreloc.c @@ -593,11 +593,7 @@ 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 + dir = g_build_filename(prefix, LIBDIR, NULL); g_free(prefix); return dir; |