projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
tools
/
perf
/
Makefile.perf
diff --git
a/tools/perf/Makefile.perf
b/tools/perf/Makefile.perf
index
6641abb
..
2d90875
100644
(file)
--- a/
tools/perf/Makefile.perf
+++ b/
tools/perf/Makefile.perf
@@
-161,7
+161,7
@@
TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
BPF_DIR = $(srctree)/tools/lib/bpf/
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
BPF_DIR = $(srctree)/tools/lib/bpf/
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
-# include
config/Makefile
by default and rule out
+# include
Makefile.config
by default and rule out
# non-config cases
config := 1
# non-config cases
config := 1
@@
-183,7
+183,7
@@
ifeq ($(filter feature-dump,$(MAKECMDGOALS)),feature-dump)
FEATURE_TESTS := all
endif
endif
FEATURE_TESTS := all
endif
endif
-include
config/Makefile
+include
Makefile.config
endif
ifeq ($(config),0)
endif
ifeq ($(config),0)
@@
-706,7
+706,7
@@
$(INSTALL_DOC_TARGETS):
### Cleaning rules
#
### Cleaning rules
#
-# This is here, not in
config/Makefile, because config/Makefile
does
+# This is here, not in
Makefile.config, because Makefile.config
does
# not get included for the clean target:
#
config-clean:
# not get included for the clean target:
#
config-clean: