diff options
| -rw-r--r-- | hardinfo2/Makefile.in | 4 | ||||
| -rw-r--r-- | hardinfo2/binreloc.c | 6 | ||||
| -rwxr-xr-x | hardinfo2/configure | 5 | ||||
| -rw-r--r-- | hardinfo2/stock.c | 14 | ||||
| -rw-r--r-- | hardinfo2/util.c | 4 |
5 files changed, 21 insertions, 12 deletions
diff --git a/hardinfo2/Makefile.in b/hardinfo2/Makefile.in index 76e7abb6..52158394 100644 --- a/hardinfo2/Makefile.in +++ b/hardinfo2/Makefile.in @@ -61,7 +61,7 @@ install: all mkdir -p ${DESTDIR}/usr/bin mkdir -p ${DESTDIR}/usr/local mkdir -p ${DESTDIR}/usr/share/applications - mkdir -p ${DESTDIR}/usr/lib/hardinfo/modules + mkdir -p ${DESTDIR}${LIBDIR}/hardinfo/modules mkdir -p ${DESTDIR}/usr/share/hardinfo/pixmaps @echo '[01;34m*** Installing icon...[00m' @@ -71,7 +71,7 @@ install: all cp hardinfo ${DESTDIR}/usr/bin/hardinfo @echo '[01;34m*** Installing modules...[00m' - cp -Lr modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules + cp -Lr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules @echo '[01;34m*** Installing pixmaps...[00m' cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps diff --git a/hardinfo2/binreloc.c b/hardinfo2/binreloc.c index 358445cd..1d1acfe6 100644 --- a/hardinfo2/binreloc.c +++ b/hardinfo2/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; } diff --git a/hardinfo2/configure b/hardinfo2/configure index e8dc02fd..0a36779d 100755 --- a/hardinfo2/configure +++ b/hardinfo2/configure @@ -45,6 +45,7 @@ case $OS in esac PROC=`uname -m` +LIBDIR='/usr/lib' case $PROC in i?86) ln -sf linux/x86 arch/this @@ -54,7 +55,8 @@ case $PROC in ARCH="ARCH_PPC" ;; x86_64) ln -sf linux/x86_64 arch/this - ARCH="ARCH_x86_64" ;; + ARCH="ARCH_x86_64" + LIBDIR="/usr/lib64" ;; mips*) ln -sf linux/mips arch/this ARCH="ARCH_MIPS" ;; @@ -214,6 +216,7 @@ echo "SOUP_LIBS = ${SOUP_LIBS}" >> Makefile echo "SOUP_CFLAGS = ${SOUP_FLAGS}" >> Makefile echo "PACKAGE = `basename ${PWD}`" >> Makefile echo "ARCHOPTS = " >> Makefile +echo "LIBDIR = $LIBDIR" >> Makefile cat Makefile.in >> Makefile diff --git a/hardinfo2/stock.c b/hardinfo2/stock.c index a1bf7bf2..748379e8 100644 --- a/hardinfo2/stock.c +++ b/hardinfo2/stock.c @@ -25,13 +25,13 @@ static struct { gchar *filename; gchar *stock_id; } stock_icons[] = { - { - "report.png", HI_STOCK_REPORT}, { - "internet.png", HI_STOCK_INTERNET}, { - "module.png", HI_STOCK_MODULE}, { - "about-modules.png", HI_STOCK_ABOUT_MODULES}, { - "syncmanager-small.png", HI_STOCK_SYNC_MENU}, { -"face-grin.png", HI_STOCK_DONATE},}; + { "report.png", HI_STOCK_REPORT}, + { "internet.png", HI_STOCK_INTERNET}, + { "module.png", HI_STOCK_MODULE}, + { "about-modules.png", HI_STOCK_ABOUT_MODULES}, + { "syncmanager-small.png", HI_STOCK_SYNC_MENU}, + { "face-grin.png", HI_STOCK_DONATE}, +}; static GtkIconFactory *icon_factory; diff --git a/hardinfo2/util.c b/hardinfo2/util.c index 75cdbfd1..375bb995 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -707,7 +707,7 @@ static GSList *modules_check_deps(GSList * modules) ShellModule *mod = module_load(deps[i]); if (mod) - modules = g_slist_append(modules, mod); + modules = g_slist_prepend(modules, mod); modules = modules_check_deps(modules); /* re-check dependencies */ } else { modules = g_slist_remove(modules, module); @@ -743,7 +743,7 @@ static GSList *modules_load(gchar ** module_list) if (g_strrstr(filename, "." G_MODULE_SUFFIX) && module_in_module_list(filename, module_list) && ((module = module_load(filename)))) { - modules = g_slist_append(modules, module); + modules = g_slist_prepend(modules, module); } } |