summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-09-12 13:29:34 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-09-12 14:14:19 -0400
commitb110165be41eaeaec3b1fce1d0e9be9965193855 (patch)
tree6a7b79a56c14dca16893a8d2008e97f9eb86a49d
parent9993bc48ac187e341c6db2255fb44e165fcf3aab (diff)
man: remove the "general" subdirectory
Also remove old IMakefile revision tags. The "man" subdir now consistent with all other modules. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--configure.ac1
-rw-r--r--man/Consortium.man (renamed from man/general/Consortium.man)0
-rw-r--r--man/Makefile.am24
-rw-r--r--man/Standards.man (renamed from man/general/Standards.man)2
-rw-r--r--man/X.man (renamed from man/general/X.man)2
-rw-r--r--man/XOrgFoundation.man (renamed from man/general/XOrgFoundation.man)0
-rw-r--r--man/XProjectTeam.man (renamed from man/general/XProjectTeam.man)2
-rw-r--r--man/Xsecurity.man (renamed from man/general/Xsecurity.man)0
-rw-r--r--man/general/Makefile.am45
9 files changed, 23 insertions, 53 deletions
diff --git a/configure.ac b/configure.ac
index 3b98568..42b8e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ XORG_CHECK_DOCBOOK
AC_OUTPUT([Makefile
man/Makefile
- man/general/Makefile
sgml/Makefile
sgml/fonts/Makefile
sgml/graphics/Makefile
diff --git a/man/general/Consortium.man b/man/Consortium.man
index 4ca4ea8..4ca4ea8 100644
--- a/man/general/Consortium.man
+++ b/man/Consortium.man
diff --git a/man/Makefile.am b/man/Makefile.am
index 68eda49..74ad43e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,4 +20,26 @@
#
# Process this file with autoconf to create configure.
-SUBDIRS = general
+miscmandir = $(MISC_MAN_DIR)
+
+miscman_PRE = \
+ Consortium.man \
+ Xsecurity.man \
+ Standards.man \
+ X.man \
+ XOrgFoundation.man \
+ XProjectTeam.man
+
+miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
+
+EXTRA_DIST = $(miscman_PRE)
+CLEANFILES = $(miscman_DATA)
+SUFFIXES = .$(MISC_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__datadir__|$(datadir)|g' \
+ -e 's|__libdir__|$(libdir)|g' \
+ -e 's|__sysconfdir__|$(sysconfdir)|g'
+
+.man.$(MISC_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/general/Standards.man b/man/Standards.man
index d904efd..49fe37a 100644
--- a/man/general/Standards.man
+++ b/man/Standards.man
@@ -1,5 +1,3 @@
-.\" $Xorg: Standards.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $
-.\" $XdotOrg: xc/doc/man/general/Standards.man,v 1.3 2004/09/03 16:18:18 kem Exp $
.\" Copyright (c) 1993, 1994, 1996, 2004 The Open Group
.\"
.\" All rights reserved.
diff --git a/man/general/X.man b/man/X.man
index 6796107..1f110ad 100644
--- a/man/general/X.man
+++ b/man/X.man
@@ -1,5 +1,3 @@
-.\" $Xorg: X.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $
-.\" $XdotOrg: xc/doc/man/general/X.man,v 1.6 2004/12/08 13:42:01 ago Exp $
.\"
.\" Copyright (c) 1994, 2004 The Open Group
.\" Copyright \(co 2000 The XFree86 Project, Inc.
diff --git a/man/general/XOrgFoundation.man b/man/XOrgFoundation.man
index 719f3ac..719f3ac 100644
--- a/man/general/XOrgFoundation.man
+++ b/man/XOrgFoundation.man
diff --git a/man/general/XProjectTeam.man b/man/XProjectTeam.man
index d7673da..6a592fb 100644
--- a/man/general/XProjectTeam.man
+++ b/man/XProjectTeam.man
@@ -1,4 +1,3 @@
-.\" $Xorg: XProjectTeam.cpp,v 1.6 2001/01/29 17:44:41 coskrey Exp $
.\" Copyright (c) 1993, 1994, 1996 X Consortium
.\" Copyright (c) 1996, 2000 The Open Group
.\"
@@ -25,7 +24,6 @@
.\" dealing in this Software without prior written authorization from the
.\" X Consortium.
.\"
-.\" $XFree86: xc/doc/man/general/XProjectTeam.man,v 1.2 2001/01/27 18:20:38 dawes Exp $
.\"
.TH XORG __miscmansuffix__ __xorgversion__
.SH NAME
diff --git a/man/general/Xsecurity.man b/man/Xsecurity.man
index 671cf1e..671cf1e 100644
--- a/man/general/Xsecurity.man
+++ b/man/Xsecurity.man
diff --git a/man/general/Makefile.am b/man/general/Makefile.am
deleted file mode 100644
index 74ad43e..0000000
--- a/man/general/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2005 Red Hat, Inc.
-#
-# Permission to use, copy, modify, distribute, and sell this software
-# and its documentation for any purpose is hereby granted without fee,
-# provided that the above copyright notice appear in all copies and
-# that both that copyright notice and this permission notice appear in
-# supporting documentation, and that the name of Red Hat not be used in
-# advertising or publicity pertaining to distribution of the software
-# without specific, written prior permission. Red Hat makes no
-# representations about the suitability of this software for any
-# purpose. It is provided "as is" without express or implied warranty.
-#
-# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-# NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-# USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Process this file with autoconf to create configure.
-
-miscmandir = $(MISC_MAN_DIR)
-
-miscman_PRE = \
- Consortium.man \
- Xsecurity.man \
- Standards.man \
- X.man \
- XOrgFoundation.man \
- XProjectTeam.man
-
-miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
-
-EXTRA_DIST = $(miscman_PRE)
-CLEANFILES = $(miscman_DATA)
-SUFFIXES = .$(MISC_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-MAN_SUBSTS += -e 's|__datadir__|$(datadir)|g' \
- -e 's|__libdir__|$(libdir)|g' \
- -e 's|__sysconfdir__|$(sysconfdir)|g'
-
-.man.$(MISC_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@