Put man pages from tapset in 3stap (PR9870).

diff --git a/Makefile.in b/Makefile.in
index 73ef5bacb7a2aa47439f2b3f27c70598f0f09379..12a5e6eab4eb655d20c0aaa9c84c843595d939dc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -288,6 +288,7 @@ staplog_CPPFLAGS = @staplog_CPPFLAGS@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 93753666e79aa0775ab0225f6cd38847a8b07e65..e23a669946998e790486f9a4149019cb84e8a9b9 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -163,6 +163,7 @@ staplog_CPPFLAGS = @staplog_CPPFLAGS@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 PDF_FILES = tutorial.pdf langref.pdf

diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am
index 9e7d2069a972f8deef01b790a69cfa510db53845..68dfd97130512ed2695b2ddaed6be9e86626f199 100644 (file)
--- a/doc/SystemTap_Tapset_Reference/Makefile.am
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am
@@ -2,7 +2,7 @@
 ## process this file with automake to produce Makefile.in
 
 DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
-MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man5
+MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3stap
 HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets
 
 
@@ -36,7 +36,7 @@ tapsets.pdf: tapsets.xml
        xmlto pdf tapsets.xml
 
 stamp-mandocs: tapsets.xml
-       xmlto man -o man5 tapsets.xml
+       xmlto man -o man3stap tapsets.xml
        touch stamp-mandocs
 
 #FIXME need to figure out where to install things appropriately
@@ -45,7 +45,7 @@ install-data-hook:
        $(MKDIR_P)  $(DOC_INSTALL_DIR)
        $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR)
        $(MKDIR_P)  $(MAN_INSTALL_DIR)
-       $(INSTALL_DATA) man5/* $(MAN_INSTALL_DIR)
+       $(INSTALL_DATA) man3stap/* $(MAN_INSTALL_DIR)
        $(MKDIR_P)  $(HTML_INSTALL_DIR)
        $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR)
 endif

diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index 84d2114c620b08d618fb4f287af3cc52498473bd..2f8a52942d2db75635c7b0888a7e36a1f1de344e 100644 (file)
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -166,10 +166,11 @@ staplog_CPPFLAGS = @staplog_CPPFLAGS@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
-MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man5
+MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3stap
 HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets
 SRCTREE = $(abs_top_srcdir)/
 DOCPROC = $(abs_builddir)/docproc
@@ -429,7 +430,7 @@ uninstall-am:
 @BUILD_REFDOCS_TRUE@   xmlto pdf tapsets.xml
 
 @BUILD_REFDOCS_TRUE@stamp-mandocs: tapsets.xml
-@BUILD_REFDOCS_TRUE@   xmlto man -o man5 tapsets.xml
+@BUILD_REFDOCS_TRUE@   xmlto man -o man3stap tapsets.xml
 @BUILD_REFDOCS_TRUE@   touch stamp-mandocs
 
 #FIXME need to figure out where to install things appropriately
@@ -438,7 +439,7 @@ uninstall-am:
 @BUILD_REFDOCS_TRUE@   $(MKDIR_P)  $(DOC_INSTALL_DIR)
 @BUILD_REFDOCS_TRUE@   $(INSTALL_DATA) tapsets.pdf $(DOC_INSTALL_DIR)
 @BUILD_REFDOCS_TRUE@   $(MKDIR_P)  $(MAN_INSTALL_DIR)
-@BUILD_REFDOCS_TRUE@   $(INSTALL_DATA) man5/* $(MAN_INSTALL_DIR)
+@BUILD_REFDOCS_TRUE@   $(INSTALL_DATA) man3stap/* $(MAN_INSTALL_DIR)
 @BUILD_REFDOCS_TRUE@   $(MKDIR_P)  $(HTML_INSTALL_DIR)
 @BUILD_REFDOCS_TRUE@   $(INSTALL_DATA) tapsets/* $(HTML_INSTALL_DIR)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index add4ba3c96c67c6c69a6d0537bbdcd98b4037c80..9947882d0c88260d7e0c33cf88f5e7f85f7714ec 100755 (executable)
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -981,7 +981,7 @@ sub output_probe_xml(%) {
     print "</refentryinfo>\n";
     print "<refmeta>\n";
     print " <refentrytitle><phrase>".$args{'probe'}."</phrase></refentrytitle>\n";
-    print " <manvolnum>5</manvolnum>\n";
+    print " <manvolnum>3stap</manvolnum>\n";
 #    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
     print "</refmeta>\n";
     print "<refnamediv>\n";
@@ -1039,7 +1039,7 @@ sub output_sfunction_xml(%) {
     print "</refentryinfo>\n";
     print "<refmeta>\n";
     print " <refentrytitle><phrase>".$args{'sfunction'}."</phrase></refentrytitle>\n";
-    print " <manvolnum>5</manvolnum>\n";
+    print " <manvolnum>3stap</manvolnum>\n";
 #    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
     print "</refmeta>\n";
     print "<refnamediv>\n";