diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | hardinfo/hardinfo.c | 6 | ||||
| -rw-r--r-- | includes/hardinfo.h | 4 | 
3 files changed, 10 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 55aefb98..cf29a960 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,9 @@ if (OVRCPUINFO)  	message(STATUS "/proc/cpuinfo override: ${OVRCPUINFO}")  endif() +add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale") +message(STATUS "LOCALEDIR = ${CMAKE_INSTALL_PREFIX}/share/locale") +  message(STATUS "Building HardInfo for architecture: ${HARDINFO_OS}-${HARDINFO_ARCH}")  add_definitions("-std=gnu89") diff --git a/hardinfo/hardinfo.c b/hardinfo/hardinfo.c index 3d7a9c6f..d01cb7c7 100644 --- a/hardinfo/hardinfo.c +++ b/hardinfo/hardinfo.c @@ -33,7 +33,7 @@ int main(int argc, char **argv)  {      GSList *modules; -    bindtextdomain("hardinfo", "/usr/share/locale"); +    bindtextdomain("hardinfo", LOCALEDIR);      textdomain("hardinfo");      DEBUG("HardInfo version " VERSION ". Debug version."); @@ -111,13 +111,13 @@ int main(int argc, char **argv)      /* initialize vendor database */      vendor_init(); -     +      /* initialize moreinfo */      moreinfo_init();      if (params.run_benchmark) {          gchar *result; -         +          result = module_call_method_param("benchmark::runBenchmark", params.run_benchmark);          if (!result) {            g_error(_("Unknown benchmark ``%s'' or libbenchmark.so not loaded"), params.run_benchmark); diff --git a/includes/hardinfo.h b/includes/hardinfo.h index 5728e711..cef49489 100644 --- a/includes/hardinfo.h +++ b/includes/hardinfo.h @@ -30,6 +30,10 @@  #define C_(CTX, STRING) pgettext(CTX, STRING)  #define NC_(CTX, STRING) (STRING) +#ifndef LOCALEDIR +#define LOCALEDIR "/usr/share/locale" +#endif +  typedef enum {    MODULE_FLAG_NONE = 0,    MODULE_FLAG_NO_REMOTE = 1<<0,  | 
