--- arch/common/zlib.h	2007-07-20 18:44:59 +0400
+++ arch/common/zlib.h	2007-10-27 13:19:54 +0400
@@ -27,7 +27,7 @@
     if (!(compress && compressBound)) {
 	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
 	if (!libz) {
-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
+            libz = g_module_open(LIBDIR "/libz.so", G_MODULE_BIND_LAZY);
             if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return;

--- arch/linux/common/os.h	2007-07-20 18:44:57 +0400
+++ arch/linux/common/os.h	2007-10-27 13:20:41 +0400
@@ -16,6 +16,8 @@
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include "config.h"
+
 static gchar *
 get_libc_version(void)
 {
@@ -22,7 +22,7 @@
     FILE *libc;
     gchar buf[256], *tmp, *p;
     
-    libc = popen("/lib/libc.so.6", "r");
+    libc = popen((LIBDIR "/libc.so.6") + 4, "r");
     if (!libc) goto err;
     
     fgets(buf, 256, libc);

--- configure.orig	2008-01-22 11:28:51 +0300
+++ configure	2008-01-22 11:35:23 +0300
@@ -189,7 +189,7 @@ echo "#define KERNEL   \"`uname -r`\"" >
 echo "#define HOSTNAME \"`hostname`\"" >> config.h
 
 echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h
-echo "#define LIBPREFIX \"/usr/lib/hardinfo/\"" >> config.h
+echo "#define LIBPREFIX \"$LIBDIR/hardinfo/\"" >> config.h
 
 if [ "$SOUP" == "1" ]; then
 	echo "#define HAS_LIBSOUP" >> config.h

--- configure.orig	2008-01-22 11:40:29 +0300
+++ configure	2008-01-22 11:43:27 +0300
@@ -190,6 +190,7 @@ echo "#define HOSTNAME \"`hostname`\"" >
 
 echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h
 echo "#define LIBPREFIX \"$LIBDIR/hardinfo/\"" >> config.h
+echo "#define LIBDIR \"$LIBDIR\"" >> config.h
 
 if [ "$SOUP" == "1" ]; then
 	echo "#define HAS_LIBSOUP" >> config.h