diff options
| author | hwspeedy <ns@bigbear.dk> | 2024-05-21 02:48:39 +0200 |
|---|---|---|
| committer | hwspeedy <ns@bigbear.dk> | 2024-05-21 02:48:39 +0200 |
| commit | afaeaad75072be55c286875d5478c064ddd4fde8 (patch) | |
| tree | f3f0d304ab2abda89ecc0291de7b48ad465d56d4 | |
| parent | d92107a44dc30dc098a300b9e156d03c19e489d8 (diff) | |
FIX binreloc dirs hardcoded - add verbose output
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | hardinfo2/hardinfo.c | 5 | ||||
| -rw-r--r-- | includes/hardinfo.h | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/config.h.cmake b/config.h.cmake index 8c5aba24..08ae5295 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -12,8 +12,7 @@ #define LIBDIR "@CMAKE_INSTALL_LIBDIR@" #define LIBPREFIX "@CMAKE_INSTALL_FULL_LIBDIR@/hardinfo2" -#define PREFIX "@CMAKE_INSTALL_DATAROOTDIR@/hardinfo2" -#define LOCALEDIR "@CMAKE_INSTALL_LOCALEDIR@" +#define PREFIX "@CMAKE_INSTALL_FULL_DATAROOTDIR@/hardinfo2" #cmakedefine HARDINFO2_DEBUG @HARDINFO2_DEBUG@ #cmakedefine CMAKE_BUILD_TYPE @CMAKE_BUILD_TYPE@ diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c index 85bd2a91..9ef0ea78 100644 --- a/hardinfo2/hardinfo.c +++ b/hardinfo2/hardinfo.c @@ -75,11 +75,14 @@ int main(int argc, char **argv) " Data prefix: %s\n" " Library prefix: %s\n" " Locale prefix : %s\n" + " Data hardcoded: %s\n" + " Library hardcoded: %s\n" + " Locale hardcoded: %s\n" " Compiled for: %s\n"), RELEASE==1 ? "Yes (" VERSION ")" : (RELEASE==0?"No (" VERSION ")":"Debug (" VERSION ")"), ARCH, HARDINFO2_LIBSOUP3 ? _("3.0") : "2.4", ENABLE_BINRELOC ? _("Yes") : _("No"), - params.path_data, params.path_lib, params.path_locale, PLATFORM); + params.path_data, params.path_lib, params.path_locale, PREFIX, LIBPREFIX,LOCALEDIR, PLATFORM); return 0; } diff --git a/includes/hardinfo.h b/includes/hardinfo.h index 83fe6090..0e59f045 100644 --- a/includes/hardinfo.h +++ b/includes/hardinfo.h @@ -33,10 +33,6 @@ #define HARDINFO2_COPYRIGHT_LATEST_YEAR 2024 -/*#ifndef LOCALEDIR -#define LOCALEDIR "/usr/share/locale" -#endif*/ - typedef enum { MODULE_FLAG_NONE = 0, MODULE_FLAG_NO_REMOTE = 1<<0, |