← Back to branch summary

~mfisch/ubuntu/trusty/lm-sensors/merge-to-3.3.4

« back to all changes in this revision

Viewing changes to prog/sensors/Module.mk

  • Committer: Package Import Robot
  • Author(s): Matthew Fischer
  • Date: 2013-05-09 21:55:15 UTC
  • mfrom: (2.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20130509215515-6o5cnzywmtduywij
Tags: 1:3.3.3-1ubuntu1
https://launchpad.net/bugs/1178520
* Merge from Debian unstable (LP: #1178520). Remaining changes:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script.

Show diffs side-by-side

added added

removed removed

Lines of Context:
prog/sensors/Module.mk
37
37
REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS))
38
38
REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES))
39
39
 
40
 
LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi)
 
40
LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi)
41
41
 
42
42
$(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
43
43
        $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors