Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Move paths config into config/Makefile

Moving paths config into config/Makefile.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-17-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
cd1c39f2 58a0abd7

+52 -58
-58
tools/perf/Makefile
··· 99 99 include config/Makefile 100 100 endif 101 101 102 - # Among the variables below, these: 103 - # perfexecdir 104 - # template_dir 105 - # mandir 106 - # infodir 107 - # htmldir 108 - # ETC_PERFCONFIG (but not sysconfdir) 109 - # can be specified as a relative path some/where/else; 110 - # this is interpreted as relative to $(prefix) and "perf" at 111 - # runtime figures out where they are based on the path to the executable. 112 - # This can help installing the suite in a relocatable way. 113 - 114 - # Make the path relative to DESTDIR, not to prefix 115 - ifndef DESTDIR 116 - prefix = $(HOME) 117 - endif 118 - bindir_relative = bin 119 - bindir = $(prefix)/$(bindir_relative) 120 - mandir = share/man 121 - infodir = share/info 122 - perfexecdir = libexec/perf-core 123 - sharedir = $(prefix)/share 124 - template_dir = share/perf-core/templates 125 - htmldir = share/doc/perf-doc 126 - ifeq ($(prefix),/usr) 127 - sysconfdir = /etc 128 - ETC_PERFCONFIG = $(sysconfdir)/perfconfig 129 - else 130 - sysconfdir = $(prefix)/etc 131 - ETC_PERFCONFIG = etc/perfconfig 132 - endif 133 - lib = lib 134 - 135 102 export prefix bindir sharedir sysconfdir 136 103 137 104 # sparse is architecture-neutral, which means that we need to tell it ··· 522 555 endif # MAKECMDGOALS != tags 523 556 endif # MAKECMDGOALS != clean 524 557 525 - # Shell quote (do not use $(call) to accommodate ancient setups); 526 - 527 - ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG)) 528 - 529 - DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) 530 - bindir_SQ = $(subst ','\'',$(bindir)) 531 - bindir_relative_SQ = $(subst ','\'',$(bindir_relative)) 532 - mandir_SQ = $(subst ','\'',$(mandir)) 533 - infodir_SQ = $(subst ','\'',$(infodir)) 534 - perfexecdir_SQ = $(subst ','\'',$(perfexecdir)) 535 - template_dir_SQ = $(subst ','\'',$(template_dir)) 536 - htmldir_SQ = $(subst ','\'',$(htmldir)) 537 - prefix_SQ = $(subst ','\'',$(prefix)) 538 - sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) 539 - 540 - SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) 541 - 542 558 LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group 543 559 544 560 ALL_CFLAGS += $(BASIC_CFLAGS) ··· 529 579 ALL_LDFLAGS += $(BASIC_LDFLAGS) 530 580 531 581 export INSTALL SHELL_PATH 532 - 533 582 534 583 ### Build rules 535 584 ··· 770 821 fi 771 822 772 823 ### Installation rules 773 - 774 - ifneq ($(filter /%,$(firstword $(perfexecdir))),) 775 - perfexec_instdir = $(perfexecdir) 776 - else 777 - perfexec_instdir = $(prefix)/$(perfexecdir) 778 - endif 779 - perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir)) 780 824 781 825 install-bin: all 782 826 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+52
tools/perf/config/Makefile
··· 390 390 EXTLIBS += -lnuma 391 391 endif 392 392 endif 393 + 394 + # Among the variables below, these: 395 + # perfexecdir 396 + # template_dir 397 + # mandir 398 + # infodir 399 + # htmldir 400 + # ETC_PERFCONFIG (but not sysconfdir) 401 + # can be specified as a relative path some/where/else; 402 + # this is interpreted as relative to $(prefix) and "perf" at 403 + # runtime figures out where they are based on the path to the executable. 404 + # This can help installing the suite in a relocatable way. 405 + 406 + # Make the path relative to DESTDIR, not to prefix 407 + ifndef DESTDIR 408 + prefix = $(HOME) 409 + endif 410 + bindir_relative = bin 411 + bindir = $(prefix)/$(bindir_relative) 412 + mandir = share/man 413 + infodir = share/info 414 + perfexecdir = libexec/perf-core 415 + sharedir = $(prefix)/share 416 + template_dir = share/perf-core/templates 417 + htmldir = share/doc/perf-doc 418 + ifeq ($(prefix),/usr) 419 + sysconfdir = /etc 420 + ETC_PERFCONFIG = $(sysconfdir)/perfconfig 421 + else 422 + sysconfdir = $(prefix)/etc 423 + ETC_PERFCONFIG = etc/perfconfig 424 + endif 425 + lib = lib 426 + 427 + # Shell quote (do not use $(call) to accommodate ancient setups); 428 + ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG)) 429 + DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) 430 + bindir_SQ = $(subst ','\'',$(bindir)) 431 + mandir_SQ = $(subst ','\'',$(mandir)) 432 + infodir_SQ = $(subst ','\'',$(infodir)) 433 + perfexecdir_SQ = $(subst ','\'',$(perfexecdir)) 434 + template_dir_SQ = $(subst ','\'',$(template_dir)) 435 + htmldir_SQ = $(subst ','\'',$(htmldir)) 436 + prefix_SQ = $(subst ','\'',$(prefix)) 437 + sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) 438 + 439 + ifneq ($(filter /%,$(firstword $(perfexecdir))),) 440 + perfexec_instdir = $(perfexecdir) 441 + else 442 + perfexec_instdir = $(prefix)/$(perfexecdir) 443 + endif 444 + perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))