Attachment #2242 for bug #13118

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

Lines 27-33 Link Here

(-)hardinfo-0.4.2.2/arch/common/zlib.h (-1 / +1 lines)
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;

Lines 22-28 Link Here

(-)hardinfo-0.4.2.2/arch/linux/common/os.h (-1 / +1 lines)
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);

Lines 42-50 Link Here

(-)hardinfo-0.4.2.2/autopackage/default.apspec (-3 / +3 lines)
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]

Lines 22-27 Link Here

(-)hardinfo-0.4.2.2/binreloc.c (-2 / +4 lines)
22	#include <string.h>	22	#include <string.h>
23	#include "binreloc.h"	23	#include "binreloc.h"
24		24
		25	#include "config.h"
		26
25	G_BEGIN_DECLS	27	G_BEGIN_DECLS
26	/** @internal	28	/** @internal
27	* Find the canonical filename of the executable. Returns the filename	29	* Find the canonical filename of the executable. Returns the filename
Lines 592-598 Link Here
592	return NULL;	594	return NULL;
593	}	595	}
594		596
595	dir = g_build_filename(prefix, "lib", NULL);	597	dir = g_build_filename(prefix, LIBDIR, NULL);
596	g_free(prefix);	598	g_free(prefix);
597	return dir;	599	return dir;
598	}	600	}
Lines 624-630 Link Here
624	return NULL;	626	return NULL;
625	}	627	}
626		628
627	dir = g_build_filename(prefix, "libexec", NULL);	629	dir = g_build_filename(prefix, LIBEXECDIR, NULL);
628	g_free(prefix);	630	g_free(prefix);
629	return dir;	631	return dir;
630	}	632	}

Lines 173-178 Link Here

(-)hardinfo-0.4.2.2/configure (+13 lines)
173	# --------------------------------------------------------------------------	173	# --------------------------------------------------------------------------
174		174
175	echo -e "\nWriting config.h..."	175	echo -e "\nWriting config.h..."
		176	arh=`arch`
		177	if [ "$arh" == x86_64 ];then
		178	suf=64
		179	echo $suf
		180	else
		181	suf=''
		182	echo !!!!!!
		183	fi
		184
176	rm -f config.h	185	rm -f config.h
177	echo -e "#ifndef __CONFIG_H__\n#define __CONFIG_H__\n" > config.h	186	echo -e "#ifndef __CONFIG_H__\n#define __CONFIG_H__\n" > config.h
178		187
Lines 189-194 Link Here
189	echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h	198	echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h
190	echo "#define LIBPREFIX \"/usr/lib64/hardinfo/\"" >> config.h	199	echo "#define LIBPREFIX \"/usr/lib64/hardinfo/\"" >> config.h
191		200
		201	echo "#define LIBDIR \"/usr/lib$suf/\"" >> config.h
		202	echo "#define LIBEXECDIR \"/usr/lib/\"" >> config.h
		203
		204
192	if [ "$SOUP" == "1" ]; then	205	if [ "$SOUP" == "1" ]; then
193	echo "#define HAS_LIBSOUP" >> config.h	206	echo "#define HAS_LIBSOUP" >> config.h
194	fi	207	fi

Return to bug 13118