Show
Ignore:
Timestamp:
04/19/12 15:18:45 (13 months ago)
Author:
khali
Message:

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.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/lib/Module.mk

    r6035 r6045  
    145145             echo '******************************************************************************' ; \ 
    146146           fi ; \ 
    147            grep -q '^$(LIBDIR)$$' /etc/ld.so.conf || \ 
    148            grep -q '^$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \ 
    149            grep -q '[[:space:]:,]$(LIBDIR)$$' /etc/ld.so.conf || \ 
    150            grep -q '[[:space:]:,]$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \ 
     147           cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '^$(LIBDIR)$$' || \ 
     148           cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '^$(LIBDIR)[[:space:]:,=]' || \ 
     149           cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '[[:space:]:,]$(LIBDIR)$$' || \ 
     150           cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '[[:space:]:,]$(LIBDIR)[[:space:]:,=]' || \ 
    151151                ( echo '******************************************************************************' ; \ 
    152152                  echo 'Warning: Library directory $(LIBDIR) is not in /etc/ld.so.conf!' ; \