From 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 26 Mar 2010 20:44:23 -0400 Subject: man: build vmmouse_detect man page The generated file was checked-in and was wrong. The file suffix is now computed based on the platform The macro substitution has been restored Reviewed-by: Dan Nicholson Signed-off-by: Gaetan Nadon --- configure.ac | 1 + man/.gitignore | 3 --- man/Makefile.am | 10 +++------ man/vmmouse_detect.1 | 58 -------------------------------------------------- man/vmmouse_detect.man | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 man/.gitignore delete mode 100644 man/vmmouse_detect.1 create mode 100644 man/vmmouse_detect.man diff --git a/configure.ac b/configure.ac index 6fc3b6a..e39fcbb 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,7 @@ AM_CONFIG_HEADER([config.h]) AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +AC_PROG_SED AH_TOP([#include "xorg-server.h"]) diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index f2c0616..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Add & Override for this directory and it's subdirectories -# Override default pattern *.[0-9] from top level .gitignore -!vmmouse_detect.1 diff --git a/man/Makefile.am b/man/Makefile.am index 2671512..142eb1d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -21,20 +21,16 @@ # DEALINGS IN THE SOFTWARE. # -man_MANS = @DRIVER_NAME@_detect.1 - drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = @DRIVER_NAME@.man +driverman_PRE = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) -EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.1 +EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man CLEANFILES = $(driverman_DATA) -SED = sed - # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 @@ -54,4 +50,4 @@ MAN_SUBSTS = \ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/vmmouse_detect.1 b/man/vmmouse_detect.1 deleted file mode 100644 index ca1ec71..0000000 --- a/man/vmmouse_detect.1 +++ /dev/null @@ -1,58 +0,0 @@ -.\" This manpage is copyright (C) 2007 Canonical, Ltd -.\" Author: Bryce Harrington -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with the Debian GNU/Linux system; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -.\" 02111-1307 USA -.\" -.\" That's right, although mdetect itself is under the QPL, this manpage is -.\" under the GPL. Enjoy! -.TH vmmouse_detect 1 "2007-07-19" "Debian GNU/Linux" -.SH NAME -vmmouse_detect \- VMware mouse device autodetection tool -.SH SYNOPSIS -vmmouse_detect -.SH OPTIONS -vmmouse_detect has no options -.SH DESCRIPTION -.B vmmouse_detect -is a tool for detecting if running in a VMware environment where vmmouse -is used. It exits with a 0 return value if the vmmouse client is -enabled, and 1 if not. -.SH DIAGNOSTICS -.BR vmmouse_detect 's -exit status is used to communicate information. -.IP 0 -.B vmmouse_detect -found a mouse and exited normally. -.IP 1 -Either the vmmouse client was not enabled, or it is not being run from -within a VMware virtual machine. -.SH BUGS -Please report bugs in -.B vmmouse_detect -. -.SH AUTHORS -.B vmmouse_detect -is copyright 2007 VMware, Inc. -.SH LICENSING -The -.B vmmouse_detect -source code is licensed under a BSD-like license. See COPYING for -details. -.PP -This manual page is licensed under the GNU General Public License. -.SH SEE ALSO -.IR mdetect (1), -.IR XFree86 (1) diff --git a/man/vmmouse_detect.man b/man/vmmouse_detect.man new file mode 100644 index 0000000..a7b884e --- /dev/null +++ b/man/vmmouse_detect.man @@ -0,0 +1,58 @@ +.\" This manpage is copyright (C) 2007 Canonical, Ltd +.\" Author: Bryce Harrington +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with the Debian GNU/Linux system; if not, write to the Free +.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +.\" 02111-1307 USA +.\" +.\" That's right, although mdetect itself is under the QPL, this manpage is +.\" under the GPL. Enjoy! +.TH vmmouse_detect __drivermansuffix__ __vendorversion__ +.SH NAME +vmmouse_detect \- VMware mouse device autodetection tool +.SH SYNOPSIS +vmmouse_detect +.SH OPTIONS +vmmouse_detect has no options +.SH DESCRIPTION +.B vmmouse_detect +is a tool for detecting if running in a VMware environment where vmmouse +is used. It exits with a 0 return value if the vmmouse client is +enabled, and 1 if not. +.SH DIAGNOSTICS +.BR vmmouse_detect 's +exit status is used to communicate information. +.IP 0 +.B vmmouse_detect +found a mouse and exited normally. +.IP 1 +Either the vmmouse client was not enabled, or it is not being run from +within a VMware virtual machine. +.SH BUGS +Please report bugs in +.B vmmouse_detect +. +.SH AUTHORS +.B vmmouse_detect +is copyright 2007 VMware, Inc. +.SH LICENSING +The +.B vmmouse_detect +source code is licensed under a BSD-like license. See COPYING for +details. +.PP +This manual page is licensed under the GNU General Public License. +.SH SEE ALSO +.IR mdetect (1), +.IR XFree86 (1) -- cgit v1.2.3