From b46393fcb426e43a1e9e8847a8671ea0c1508e10 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Wed, 10 Mar 2010 15:53:32 -0500
Subject: PR 11210 move stapprobe.* man pages to tapset::*

make on RHEL-5 and earlier cannot deal with the :: in the man page names.
This work around uses the install-data-local rule to install the
manpages to avoid confusing the older versions of make.
---
 Makefile.am | 14 +++++---------
 Makefile.in | 18 ++++--------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 684a9ecb..7b655b72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,14 +14,7 @@ AM_CXXFLAGS = -Wall -Werror
 
 man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap \
 dtrace.1 \
-staprun.8 \
-$(srcdir)/man/tapset\:\:iosched.3stap $(srcdir)/man/tapset\:\:netdev.3stap \
-$(srcdir)/man/tapset\:\:nfs.3stap $(srcdir)/man/tapset\:\:nfsd.3stap \
-$(srcdir)/man/tapset\:\:pagefault.3stap $(srcdir)/man/tapset\:\:kprocess.3stap \
-$(srcdir)/man/tapset\:\:rpc.3stap $(srcdir)/man/tapset\:\:scsi.3stap \
-$(srcdir)/man/tapset\:\:signal.3stap $(srcdir)/man/tapset\:\:socket.3stap \
-$(srcdir)/man/tapset\:\:tcp.3stap $(srcdir)/man/tapset\:\:udp.3stap
-# see also configure.ac
+staprun.8
 
 bin_PROGRAMS = staprun
 bin_SCRIPTS = stap-report
@@ -264,6 +257,8 @@ if BUILD_SERVER
 	test -e $(DESTDIR)$(localstatedir)/run/stap-server || mkdir -p $(DESTDIR)$(localstatedir)/run/stap-server
 	test -e $(DESTDIR)$(localstatedir)/log || mkdir -p $(DESTDIR)$(localstatedir)/log
 endif
+	(cd $(srcdir)/man; for f in *.3*; do $(INSTALL_DATA) -D $$f "$(DESTDIR)$(man3dir)/$$f" || exit $$?; done)
+
 
 TEST_COV_DIR = coverage
 
@@ -311,9 +306,10 @@ if BUILD_SERVER
 	rm -rf $(DESTDIR)$(localstatedir)/run/stap-server
 	rm -f $(DESTDIR)$(localstatedir)/log/stap-server/log
 endif
+	(cd $(srcdir)/man; for f in *.3*; do rm -rf "$(DESTDIR)$(man3dir)/$$f"; done)
 
 SUBDIRS = doc grapher
-DIST_SUBDIRS = testsuite $(SUBDIRS)
+DIST_SUBDIRS = testsuite man $(SUBDIRS)
 
 check-local:
 	SRCDIR=`cd $(srcdir); pwd`; \
diff --git a/Makefile.in b/Makefile.in
index 96fd0c9b..eaa226ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -378,19 +378,7 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR
 AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall -Werror
 man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
-	stapex.3stap dtrace.1 staprun.8 \
-	$(srcdir)/man/tapset\:\:iosched.3stap \
-	$(srcdir)/man/tapset\:\:netdev.3stap \
-	$(srcdir)/man/tapset\:\:nfs.3stap \
-	$(srcdir)/man/tapset\:\:nfsd.3stap \
-	$(srcdir)/man/tapset\:\:pagefault.3stap \
-	$(srcdir)/man/tapset\:\:kprocess.3stap \
-	$(srcdir)/man/tapset\:\:rpc.3stap \
-	$(srcdir)/man/tapset\:\:scsi.3stap \
-	$(srcdir)/man/tapset\:\:signal.3stap \
-	$(srcdir)/man/tapset\:\:socket.3stap \
-	$(srcdir)/man/tapset\:\:tcp.3stap \
-	$(srcdir)/man/tapset\:\:udp.3stap $(am__append_2) \
+	stapex.3stap dtrace.1 staprun.8 $(am__append_2) \
 	$(am__append_4) $(am__append_8)
 bin_SCRIPTS = stap-report $(am__append_3) $(am__append_5) \
 	$(am__append_10)
@@ -472,7 +460,7 @@ EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples
 EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta
 TEST_COV_DIR = coverage
 SUBDIRS = doc grapher
-DIST_SUBDIRS = testsuite $(SUBDIRS)
+DIST_SUBDIRS = testsuite man $(SUBDIRS)
 
 # Any extra flags, such as:
 #     --define "with_docs 0"
@@ -2043,6 +2031,7 @@ install-data-local:
 	test -e $(DESTDIR)$(sysconfdir)/systemtap || mkdir -p $(DESTDIR)$(sysconfdir)/systemtap
 @BUILD_SERVER_TRUE@	test -e $(DESTDIR)$(localstatedir)/run/stap-server || mkdir -p $(DESTDIR)$(localstatedir)/run/stap-server
 @BUILD_SERVER_TRUE@	test -e $(DESTDIR)$(localstatedir)/log || mkdir -p $(DESTDIR)$(localstatedir)/log
+	(cd $(srcdir)/man; for f in *.3*; do $(INSTALL_DATA) -D $$f "$(DESTDIR)$(man3dir)/$$f" || exit $$?; done)
 
 gcov:
 	@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
@@ -2086,6 +2075,7 @@ uninstall-local:
 	rm -rf $(DESTDIR)$(docdir)/examples
 @BUILD_SERVER_TRUE@	rm -rf $(DESTDIR)$(localstatedir)/run/stap-server
 @BUILD_SERVER_TRUE@	rm -f $(DESTDIR)$(localstatedir)/log/stap-server/log
+	(cd $(srcdir)/man; for f in *.3*; do rm -rf "$(DESTDIR)$(man3dir)/$$f"; done)
 
 check-local:
 	SRCDIR=`cd $(srcdir); pwd`; \
-- 
cgit