wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-09 16:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsensors: Fix warning about library path not in /etc/ld.so.conf

Browse Source 
On recent systems, extra configuration files can live in
/etc/ld.so.conf.d, so check this directory too, before warning.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6045 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2012-04-19 13:18:45 +00:00
1 parent 69eb49cb7f
commit 08d713c412
2 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGES
+1
View File
@@ -2,6 +2,7 @@ lm-sensors CHANGES file
-----------------------
SVN HEAD
libsensors: Fix warning about library path not in /etc/ld.so.conf
sensors: Fix libiconv linkage need detection in rare corner case
sensors-detect: Don't choke on systems without PCI
Avoid probing EDID addresses on graphics cards (#2386)
lib/Module.mk
+4 -4
View File
@@ -144,10 +144,10 @@ endif
echo ' Run the following command: rm /usr/lib/$(LIBSHBASENAME)*' ; \
echo '******************************************************************************' ; \
fi ; \
grep -q '^$(LIBDIR)$$' /etc/ld.so.conf || \
grep -q '^$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \
grep -q '[[:space:]:,]$(LIBDIR)$$' /etc/ld.so.conf || \
grep -q '[[:space:]:,]$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \
cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '^$(LIBDIR)$$' || \
cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '^$(LIBDIR)[[:space:]:,=]' || \
cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '[[:space:]:,]$(LIBDIR)$$' || \
cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '[[:space:]:,]$(LIBDIR)[[:space:]:,=]' || \
( echo '******************************************************************************' ; \
echo 'Warning: Library directory $(LIBDIR) is not in /etc/ld.so.conf!' ; \
echo ' Add it and run /sbin/ldconfig for the userspace tools to work.' ; \