From 08d713c4129ca16c298b9e8dac718166715b4f64 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 19 Apr 2012 13:18:45 +0000 Subject: [PATCH] libsensors: Fix warning about library path not in /etc/ld.so.conf 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 --- CHANGES | 1 + lib/Module.mk | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index cc48c5ee..615ed656 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/lib/Module.mk b/lib/Module.mk index 87e207f9..fdf35a9d 100644 --- a/lib/Module.mk +++ b/lib/Module.mk @@ -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.' ; \