diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2016-10-30 06:40:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2016-10-30 06:40:39 -0400 |
| commit | cbfff98a623df8d4e7c02d63d6448220cf0aec7c (patch) | |
| tree | 1a02766ada2b9be9745d6028f80a801eff5b358a /tools/perf/jvmti/Makefile | |
| parent | USB: core: add missing license information to some files (diff) | |
| parent | Linux 4.9-rc3 (diff) | |
| download | linux-cbfff98a623df8d4e7c02d63d6448220cf0aec7c.tar.gz linux-cbfff98a623df8d4e7c02d63d6448220cf0aec7c.tar.bz2 linux-cbfff98a623df8d4e7c02d63d6448220cf0aec7c.zip | |
Merge 4.9-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/jvmti/Makefile')
| -rw-r--r-- | tools/perf/jvmti/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/jvmti/Makefile b/tools/perf/jvmti/Makefile index 5ce61a1bda9c..df14e6b67b63 100644 --- a/tools/perf/jvmti/Makefile +++ b/tools/perf/jvmti/Makefile @@ -36,7 +36,7 @@ SOLIBEXT=so # The following works at least on fedora 23, you may need the next # line for other distros. ifneq (,$(wildcard /usr/sbin/update-java-alternatives)) -JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d ' ' -f 3) +JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}') else ifneq (,$(wildcard /usr/sbin/alternatives)) JDIR=$(shell alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g') |