[PATCH libpciaccess 3/5] config: provide a makefile for scanpci man pages

Gaetan Nadon memsize at videotron.ca
Sun Sep 26 12:22:23 PDT 2010


Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am     |    3 +--
 configure.ac    |    1 +
 man/Makefile.am |   34 ++++++++++++++++++++++++++++++++++
 man/scanpci.man |   44 ++++++++++++++++++++++++++++++++++++++++++++
 src/scanpci.man |   44 --------------------------------------------
 5 files changed, 80 insertions(+), 46 deletions(-)
 create mode 100644 man/Makefile.am
 create mode 100644 man/scanpci.man
 delete mode 100644 src/scanpci.man

diff --git a/Makefile.am b/Makefile.am
index 31d20a0..ea30cd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,13 +25,12 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Order: scanpci depends on libpciaccess built in src
-SUBDIRS = src scanpci
+SUBDIRS = man src scanpci
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pciaccess.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = src/scanpci.man
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 6980675..1c2a3ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,7 @@ AC_SUBST(PCIACCESS_LIBS)
 		  
 
 AC_OUTPUT([Makefile
+	   man/Makefile
 	   src/Makefile
 	   scanpci/Makefile
            pciaccess.pc])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..45edd45
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+appman_PRE = scanpci.man
+noinst_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(noinst_DATA)
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/scanpci.man b/man/scanpci.man
new file mode 100644
index 0000000..a748edf
--- /dev/null
+++ b/man/scanpci.man
@@ -0,0 +1,44 @@
+.\" Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a copy
+.\" of this software and associated documentation files (the "Software"), to
+.\" deal in the Software without restriction, including without limitation the
+.\" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+.\" sell copies of the Software, and to permit persons to whom the Software is
+.\" furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+.\" XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+.\" IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+.\" CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of the XFree86 Project shall
+.\" not be used in advertising or otherwise to promote the sale, use or other
+.\" dealings in this Software without prior written authorization from the
+.\" XFree86 Project.
+.\"
+.TH SCANPCI 1 __xorgversion__
+.SH NAME
+scanpci - scan/probe PCI buses
+.SH SYNOPSIS
+.B scanpci
+.RB [ \-v ]
+.SH DESCRIPTION
+.I Scanpci
+is a utility that can be used to scan PCI buses and report information
+about the configuration space settings for each PCI device.
+On most platforms,
+.I scanpci
+can only be run by the root user.
+.SH OPTIONS
+.TP 8
+.B \-v
+Print the configuration space information for each device in a verbose
+format.  Without this option, only a brief description is printed for
+each device.
+
diff --git a/src/scanpci.man b/src/scanpci.man
deleted file mode 100644
index aec7b2e..0000000
--- a/src/scanpci.man
+++ /dev/null
@@ -1,44 +0,0 @@
-.\" Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.
-.\" 
-.\" Permission is hereby granted, free of charge, to any person obtaining a copy
-.\" of this software and associated documentation files (the "Software"), to
-.\" deal in the Software without restriction, including without limitation the
-.\" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-.\" sell copies of the Software, and to permit persons to whom the Software is
-.\" furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-.\" XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-.\" IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-.\" CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the XFree86 Project shall
-.\" not be used in advertising or otherwise to promote the sale, use or other
-.\" dealings in this Software without prior written authorization from the
-.\" XFree86 Project.
-.\" 
-.TH SCANPCI 1 __xorgversion__
-.SH NAME
-scanpci - scan/probe PCI buses
-.SH SYNOPSIS
-.B scanpci
-.RB [ \-v ]
-.SH DESCRIPTION
-.I Scanpci
-is a utility that can be used to scan PCI buses and report information
-about the configuration space settings for each PCI device.
-On most platforms,
-.I scanpci
-can only be run by the root user.
-.SH OPTIONS
-.TP 8
-.B \-v
-Print the configuration space information for each device in a verbose
-format.  Without this option, only a brief description is printed for
-each device.
-
-- 
1.6.0.4



More information about the xorg-devel mailing list