commit b176023392360f28c0c8964a10effbc9a1f36c04
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> Fri Mar 13 21:43:08 2015 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Fri Mar 13 21:43:08 2015 +0100
tree b9e0650f3c0053f2c8f85c81be5c05adeeb441e5
parent fcf0789a96777d79d20290e08bf43943a5619387
parent b8ea351b0e154c9dc28609db58eddc6c2934c954

Merge branch 'pm-tools'

* pm-tools:
  Revert "cpupower Makefile change to help run the tool without 'make install'"

tools/power/cpupower/Makefile

diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index 3ed7c04..2e2ba2e 100644
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -209,7 +209,7 @@
 
 $(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ)
 	$(ECHO) "  CC      " $@
-	$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -Wl,-rpath=./ -lrt -lpci -L$(OUTPUT) -o $@
+	$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@
 	$(QUIET) $(STRIPCMD) $@
 
 $(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC)