summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-27 21:42:20 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-27 21:42:20 -0700
commit53971a86d2db89f32859dc26bd6594b5bc665d5b (patch)
tree350ee9f3d53494036308cd123054dac3ba86ff91 /tools
parentd5dbd3f7d82223b59dc2200c0e9f4f95665a21a4 (diff)
parentd1db0eea852497762cab43b905b879dfcd3b8987 (diff)
downloadlinux-53971a86d2db89f32859dc26bd6594b5bc665d5b.tar.gz
linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.tar.bz2
linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.zip
Merge 3.15-rc3 into usb-next
Diffstat (limited to 'tools')
-rw-r--r--tools/power/acpi/Makefile11
1 files changed, 1 insertions, 10 deletions
diff --git a/tools/power/acpi/Makefile b/tools/power/acpi/Makefile
index d9186a2fdf06..c2c0f20067a5 100644
--- a/tools/power/acpi/Makefile
+++ b/tools/power/acpi/Makefile
@@ -89,15 +89,6 @@ else
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
-# if DEBUG is enabled, then we do not strip or optimize
-ifeq ($(strip $(DEBUG)),true)
- CFLAGS += -O1 -g -DDEBUG
- STRIPCMD = /bin/true -Since_we_are_debugging
-else
- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
-endif
-
# --- ACPIDUMP BEGIN ---
vpath %.c \
@@ -128,7 +119,7 @@ clean:
-rm -f $(OUTPUT)acpidump
install-tools:
- $(INSTALL) -d $(DESTDIR)${bindir}
+ $(INSTALL) -d $(DESTDIR)${sbindir}
$(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}
install-man: