diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 10:13:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 11:36:49 -0400 |
| commit | 125e702b09a28a502e145fb434678ee27720fc48 (patch) | |
| tree | f4aec8ca216c628e7ed12e447512d21f2b10fb0e | |
| parent | 6142fdd968c76a0f2ee753c39bd5be8d1bb4ef04 (diff) | |
perf_counter tools: fix 'make install'
Remove Git leftovers from this area.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | Documentation/perf_counter/Makefile | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/Documentation/perf_counter/Makefile b/Documentation/perf_counter/Makefile index b6c665eb22e4..690045e49692 100644 --- a/Documentation/perf_counter/Makefile +++ b/Documentation/perf_counter/Makefile | |||
| @@ -255,9 +255,9 @@ EXTRA_PROGRAMS = | |||
| 255 | PROGRAMS += $(EXTRA_PROGRAMS) | 255 | PROGRAMS += $(EXTRA_PROGRAMS) |
| 256 | 256 | ||
| 257 | # | 257 | # |
| 258 | # None right now: | 258 | # Single 'perf' binary right now: |
| 259 | # | 259 | # |
| 260 | # PROGRAMS += perf-fast-import$X | 260 | PROGRAMS += perf |
| 261 | 261 | ||
| 262 | # List built-in command $C whose implementation cmd_$C() is not in | 262 | # List built-in command $C whose implementation cmd_$C() is not in |
| 263 | # builtin-$C.o but is linked in as part of some other command. | 263 | # builtin-$C.o but is linked in as part of some other command. |
| @@ -762,24 +762,9 @@ install: all | |||
| 762 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' | 762 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' |
| 763 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' | 763 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' |
| 764 | $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' | 764 | $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' |
| 765 | $(INSTALL) perf$X perf-upload-pack$X perf-receive-pack$X perf-upload-archive$X perf-shell$X perf-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)' | ||
| 766 | $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install | ||
| 767 | $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install | ||
| 768 | ifneq (,$X) | 765 | ifneq (,$X) |
| 769 | $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) perf$X)), $(RM) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/$p';) | 766 | $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) perf$X)), $(RM) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/$p';) |
| 770 | endif | 767 | endif |
| 771 | bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ | ||
| 772 | execdir=$$(cd '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' && pwd) && \ | ||
| 773 | { $(RM) "$$execdir/perf-add$X" && \ | ||
| 774 | ln "$$bindir/perf$X" "$$execdir/perf-add$X" 2>/dev/null || \ | ||
| 775 | cp "$$bindir/perf$X" "$$execdir/perf-add$X"; } && \ | ||
| 776 | { for p in $(filter-out perf-add$X,$(BUILT_INS)); do \ | ||
| 777 | $(RM) "$$execdir/$$p" && \ | ||
| 778 | ln "$$execdir/perf-add$X" "$$execdir/$$p" 2>/dev/null || \ | ||
| 779 | ln -s "perf-add$X" "$$execdir/$$p" 2>/dev/null || \ | ||
| 780 | cp "$$execdir/perf-add$X" "$$execdir/$$p" || exit; \ | ||
| 781 | done } && \ | ||
| 782 | ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/perf-add$X" | ||
| 783 | 768 | ||
| 784 | ### Maintainer's dist rules | 769 | ### Maintainer's dist rules |
| 785 | 770 | ||
