diff options
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | hardinfo/binreloc.c | 6 | ||||
| -rw-r--r-- | modules/computer.c | 6 |
3 files changed, 6 insertions, 7 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; diff --git a/modules/computer.c b/modules/computer.c index 235d642f..cd015cf2 100644 --- a/modules/computer.c +++ b/modules/computer.c @@ -204,16 +204,18 @@ void scan_dev(gboolean reload) { "Bash", "bash --version", "\\d+\\.\\d+\\.\\S+", TRUE}, { "Compilers", NULL, FALSE }, { "C (GCC)", "gcc -v", "\\d+\\.\\d+\\.\\d+", FALSE }, + { "C (Clang)", "clang -v", "\\d+\\.\\d+", FALSE }, + { "D (dmd)", "dmd --help", "\\d+\\.\\d+", TRUE }, { "Java", "javac -version", "\\d+\\.\\d+\\.\\d+", FALSE }, { "CSharp (Mono, old)", "mcs --version", "\\d+\\.\\d+\\.\\d+\\.\\d+", TRUE }, { "CSharp (Mono)", "gmcs --version", "\\d+\\.\\d+\\.\\d+\\.\\d+", TRUE }, { "Vala", "valac --version", "\\d+\\.\\d+\\.\\d+", TRUE }, { "Haskell (GHC)", "ghc -v", "\\d+\\.\\d+\\.\\d+", FALSE }, - { "FreePascal", "fpc --version", "\\d+\\.\\d+\\.\\S+", TRUE }, + { "FreePascal", "fpc -iV", "\\d+\\.\\d+\\.?\\d*", TRUE }, { "Tools", NULL, FALSE }, { "make", "make --version", "\\d+\\.\\d+", TRUE }, { "GDB", "gdb --version", "\\d+\\.\\S+", TRUE }, - { "strace", "strace -V", "\\d+\\.\\d+\\.\\d+", TRUE }, + { "strace", "strace -V", "\\d+\\.\\d+\\.?\\d*", TRUE }, { "valgrind", "valgrind --version", "\\d+\\.\\d+\\.\\S+", TRUE }, { "QMake", "qmake --version", "\\d+\\.\\S+", TRUE}, }; |