From 69eb49cb7ff9aafc41222f11433730dde25fdeb6 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 19 Apr 2012 13:13:27 +0000 Subject: [PATCH] sensors: Fix libiconv linkage need detection in rare corner case. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6044 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/sensors/Module.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ba383951..cc48c5ee 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ lm-sensors CHANGES file ----------------------- SVN HEAD + 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/prog/sensors/Module.mk b/prog/sensors/Module.mk index 0c4abf69..b6564414 100644 --- a/prog/sensors/Module.mk +++ b/prog/sensors/Module.mk @@ -37,7 +37,7 @@ INCLUDEFILES += $(PROGSENSORSSOURCES:.c=.rd) REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS)) REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES)) -LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi) +LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi) $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME) $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors