View | Details | Raw Unified | Return to bug 13118
Collapse All | Expand All

(-)hardinfo-0.4.2.2/arch/common/zlib.h (-1 / +1 lines)
Lines 27-33 Link Here
27 
    if (!(compress && compressBound)) {
 27 
    if (!(compress && compressBound)) {
28 
	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
 28 
	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
29 
	if (!libz) {
 29 
	if (!libz) {
30 
            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
 30 
            libz = g_module_open("/usr/lib64/libz.so", G_MODULE_BIND_LAZY);
31 
            if (!libz) {
 31 
            if (!libz) {
32 
                g_warning("Cannot load ZLib: %s", g_module_error());
 32 
                g_warning("Cannot load ZLib: %s", g_module_error());
33 
                return;
 33 
                return;
(-)hardinfo-0.4.2.2/arch/linux/alpha/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/armv4l/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/common/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/ia64/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/m68k/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/mips/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/parisc/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/ppc/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/s390/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/sparc/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/x86/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/arch/linux/x86_64/os.h (-1 / +1 lines)
Lines 22-28 Link Here
22 
    FILE *libc;
 22 
    FILE *libc;
23 
    gchar buf[256], *tmp, *p;
 23 
    gchar buf[256], *tmp, *p;
24
24
25 
    libc = popen("/lib/libc.so.6", "r");
 25 
    libc = popen("/lib64/libc.so.6", "r");
26 
    if (!libc) goto err;
 26 
    if (!libc) goto err;
27
27
28 
    fgets(buf, 256, libc);
 28 
    fgets(buf, 256, libc);
(-)hardinfo-0.4.2.2/autopackage/default.apspec (-3 / +3 lines)
Lines 42-50 Link Here
42 
# See http://www.autopackage.org/api/ for details
 42 
# See http://www.autopackage.org/api/ for details
43 
installExe bin/*
 43 
installExe bin/*
44 
installData share/*
 44 
installData share/*
45 
copyFile lib/hardinfo/modules/benchmark.so $PREFIX/lib/hardinfo/modules/benchmark.so
 45 
copyFile lib64/hardinfo/modules/benchmark.so $PREFIX/lib64/hardinfo/modules/benchmark.so
46 
copyFile lib/hardinfo/modules/computer.so $PREFIX/lib/hardinfo/modules/computer.so
 46 
copyFile lib64/hardinfo/modules/computer.so $PREFIX/lib64/hardinfo/modules/computer.so
47 
copyFile lib/hardinfo/modules/devices.so $PREFIX/lib/hardinfo/modules/devices.so
 47 
copyFile lib64/hardinfo/modules/devices.so $PREFIX/lib64/hardinfo/modules/devices.so
48 
installMenuItem "System" share/applications/hardinfo.desktop
 48 
installMenuItem "System" share/applications/hardinfo.desktop
49 

          49
          

        

        

          50
          
[Uninstall]

          50
          
[Uninstall]

        



(-)hardinfo-0.4.2.2/binreloc.c
      (-2 / +6 lines)




  

    
      
            Lines 22-27
          
      
      
        Link Here
      
    
  

        

          22
          
#include <string.h>

          22
          
#include <string.h>

        

        

          23
          
#include "binreloc.h"

          23
          
#include "binreloc.h"

        

        

          24
          

          24
          

        

            

              
              
              25
              
#define LIBDIR @libdir@

            

            

              26
              
#define LIBEXECDIR @libexecdir@

            

            

              27
              

            

            

              28
              

            

        

          25
          
G_BEGIN_DECLS

          29
          
G_BEGIN_DECLS

        

        

          26
          
/** @internal

          30
          
/** @internal

        

        

          27
          
 * Find the canonical filename of the executable. Returns the filename

          31
          
 * Find the canonical filename of the executable. Returns the filename

        

  

    
      
            Lines 592-598
          
      
      
        Link Here
      
    
  

        

          592
          
	    return NULL;

          596
          
	    return NULL;

        

        

          593
          
    }

          597
          
    }

        

        

          594
          

          598
          

        

          
            

              595
              
    dir = g_build_filename(prefix, "lib", NULL);


              599
              
    dir = g_build_filename(prefix, LIBDIR, NULL);

            

        

          596
          
    g_free(prefix);

          600
          
    g_free(prefix);

        

        

          597
          
    return dir;

          601
          
    return dir;

        

        

          598
          
}

          602
          
}

        

  

    
      
            Lines 624-630
          
      
      
        Link Here
      
    
  

        

          624
          
	    return NULL;

          628
          
	    return NULL;

        

        

          625
          
    }

          629
          
    }

        

        

          626
          

          630
          

        

          
            

              627
              
    dir = g_build_filename(prefix, "libexec", NULL);


              631
              
    dir = g_build_filename(prefix, LIBEXECDIR, NULL);

            

        

          628
          
    g_free(prefix);

          632
          
    g_free(prefix);

        

        

          629
          
    return dir;

          633
          
    return dir;

        

        

          630
          
}

          634
          
}

        






  

  Return to bug 13118