summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-20 16:13:46 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-20 17:36:49 +0200
commit125e702b09a28a502e145fb434678ee27720fc48 (patch)
treef4aec8ca216c628e7ed12e447512d21f2b10fb0e
parent6142fdd968c76a0f2ee753c39bd5be8d1bb4ef04 (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/Makefile19
1 files changed, 2 insertions, 17 deletions
diff --git a/Documentation/perf_counter/Makefile b/Documentation/perf_counter/Makefile
index b6c665eb22e..690045e4969 100644
--- a/Documentation/perf_counter/Makefile
+++ b/Documentation/perf_counter/Makefile
@@ -255,9 +255,9 @@ EXTRA_PROGRAMS =
PROGRAMS += $(EXTRA_PROGRAMS)
#
-# None right now:
+# Single 'perf' binary right now:
#
-# PROGRAMS += perf-fast-import$X
+PROGRAMS += perf
# List built-in command $C whose implementation cmd_$C() is not in
# builtin-$C.o but is linked in as part of some other command.
@@ -762,24 +762,9 @@ install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
- $(INSTALL) perf$X perf-upload-pack$X perf-receive-pack$X perf-upload-archive$X perf-shell$X perf-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
- $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
- $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
ifneq (,$X)
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) perf$X)), $(RM) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/$p';)
endif
- bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
- execdir=$$(cd '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' && pwd) && \
- { $(RM) "$$execdir/perf-add$X" && \
- ln "$$bindir/perf$X" "$$execdir/perf-add$X" 2>/dev/null || \
- cp "$$bindir/perf$X" "$$execdir/perf-add$X"; } && \
- { for p in $(filter-out perf-add$X,$(BUILT_INS)); do \
- $(RM) "$$execdir/$$p" && \
- ln "$$execdir/perf-add$X" "$$execdir/$$p" 2>/dev/null || \
- ln -s "perf-add$X" "$$execdir/$$p" 2>/dev/null || \
- cp "$$execdir/perf-add$X" "$$execdir/$$p" || exit; \
- done } && \
- ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/perf-add$X"
### Maintainer's dist rules