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
This commit is contained in:
Jean Delvare committed 2012-04-19 13:13:27 +00:00
1 parent 29bd5c021e
commit 69eb49cb7f
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -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)
+1 -1
View File
@@ -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