diff --git a/Makefile.am b/Makefile.am index 945afda..4678c2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -213,7 +213,7 @@ install-data-local: | while read f; do if test -x $$f; then \ i_cmd="$(INSTALL_PROGRAM)"; else \ i_cmd="$(INSTALL_DATA)"; fi; \ - $$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done) + $$i_cmd -D $$f $(DESTDIR)$(datadir)/doc/packages/systemtap/examples/$$f; done) test -e $(DESTDIR)$(sysconfdir)/systemtap || mkdir -p $(DESTDIR)$(sysconfdir)/systemtap TEST_COV_DIR = coverage diff --git a/doc/Makefile.am b/doc/Makefile.am index 55291f7..6693f11 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ ## process this file with automake to produce Makefile.in PDF_FILES = tutorial.pdf langref.pdf -DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap +DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/packages/systemtap SUBDIRS = SystemTap_Tapset_Reference if BUILD_DOCS diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am index 9e7d206..557c432 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -1,9 +1,9 @@ # Makefile.am --- automake input file for systemtap tapset reference manual ## process this file with automake to produce Makefile.in -DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap +DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/packages/systemtap MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man5 -HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets +HTML_INSTALL_DIR = $(DOC_INSTALL_DIR)/tapsets ### diff --git a/stapex.5.in b/stapex.5.in index 38f30f6..eb753d4 100644 --- a/stapex.5.in +++ b/stapex.5.in @@ -114,12 +114,12 @@ To list the probeable functions and local variables in the kernel, use another l .SH MORE EXAMPLES Larger examples, demos and samples can be found in -@prefix@/doc/systemtap*/examples, each example comes with either a .txt +@prefix@/share/doc/packages/systemtap/examples, each example comes with either a .txt or .meta file explaining what the example, sample or demo does and how it is ordinarily run. .SH SEE ALSO -.BR @prefix@/doc/systemtap*/examples +.BR @prefix@/share/doc/packages/systemtap/examples .IR stap (1) .IR stapprobes (5) .IR stapfuncs (5)