63 lines
2.8 KiB
Diff
63 lines
2.8 KiB
Diff
From: Bastian Blank <waldi@debian.org>
|
|
Date: Mon, 26 Sep 2011 13:53:12 +0100
|
|
Subject: Create manpages and binaries including the version
|
|
Forwarded: no
|
|
|
|
[bwh: Fix version insertion in perf man page cross-references and perf
|
|
man page title. Install bash_completion script for perf with a
|
|
version-dependent name.]
|
|
|
|
--- a/tools/perf/Makefile
|
|
+++ b/tools/perf/Makefile
|
|
@@ -1141,7 +1141,7 @@ perfexec_instdir_SQ = $(subst ','\'',$(p
|
|
|
|
install-bin: all
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
- $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
+ $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)/perf_$(VERSION)'
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'
|
|
$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
|
|
@@ -1154,7 +1154,7 @@ install-bin: all
|
|
$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
|
|
$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'
|
|
- $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'
|
|
+ $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)'
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
|
|
$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'
|
|
@@ -1167,7 +1167,7 @@ install-python_ext:
|
|
|
|
# 'make install-doc' should call 'make -C Documentation install'
|
|
$(INSTALL_DOC_TARGETS):
|
|
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=)
|
|
+ $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=) VERSION=$(VERSION)
|
|
|
|
### Cleaning rules
|
|
|
|
--- a/tools/perf/Documentation/Makefile
|
|
+++ b/tools/perf/Documentation/Makefile
|
|
@@ -188,13 +188,15 @@ ifdef missing_tools
|
|
$(error "You need to install $(missing_tools) for man pages")
|
|
endif
|
|
|
|
-do-install-man: man
|
|
+do-install-man: $(addprefix install-man-,$(_DOC_MAN1))
|
|
+
|
|
+install-man-perf.1: $(OUTPUT)perf.1
|
|
+ $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
|
|
+ sed -e 's/"PERF"/"PERF_$(VERSION)"/' -e 's/fBperf-/fBperf_$(VERSION)-/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION).1
|
|
+
|
|
+install-man-perf%.1: $(OUTPUT)perf%.1
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
|
|
-# $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
|
|
-# $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
|
|
- $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
|
|
-# $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
|
|
-# $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
|
|
+ sed -e 's/"PERF\\-/"PERF_$(VERSION)\\-/' -e 's/fBperf-/fBperf_$(VERSION)-/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION)$*.1
|
|
|
|
install-man: check-man-tools man
|
|
|