Distribute rmt.8; update build system

* NEWS: Update.
* bootstrap (gnulib_extra_files): Remove "missing"
* configure.ac: Do not distribute shar archive.
Define CPIO_MT_COND
* doc/Makefile.am: Always install manpages (mt.1 and rmt.8 --
depending on whether the corresponding programs are built).
* doc/cpio.1: Update.
* doc/mt.1: Update.
* lib/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
* src/Makefile.am: Likewise.
* tests/Makefile.am: Likewise.

10 files changed, 125 insertions, 46 deletions

diff --git a/NEWS b/NEWS
index 1b068ba..ecb3c37 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,14 @@
-GNU cpio NEWS -- history of user-visible changes. 2010-03-10
+GNU cpio NEWS -- history of user-visible changes. 2014-01-28
 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009,
-2010 Free Software Foundation, Inc.
+2010, 2014 Free Software Foundation, Inc.
 See the end of file for copying conditions.
 
 Please send cpio bug reports to <bug-cpio@gnu.org>.
 
+Version 2.11.90 - Git
+
+
+
 Version 2.11 - Sergey Poznyakoff, 2010-03-10
 
 * Fix mt build.
@@ -165,7 +169,7 @@ multiple links and of multi-volume archives on floppy disks.
 Copyright information:
 
 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009,
-2010 Free Software Foundation, Inc.
+2010, 2014 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/bootstrap b/bootstrap
index 11c5693..36f7a1e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -110,7 +110,6 @@ tests_base=tests
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files="
         $build_aux/install-sh
-        $build_aux/missing
         $build_aux/mdate-sh
         $build_aux/texinfo.tex
         $build_aux/depcomp
diff --git a/configure.ac b/configure.ac
index e55c25e..1d3d985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl This file is part of GNU cpio
-dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2014 Free Software
 dnl Foundation, Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
@@ -14,15 +14,15 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software Foundation,
-dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([GNU cpio], [2.11], [bug-cpio@gnu.org])
+AC_INIT([GNU cpio], [2.11.90], [bug-cpio@gnu.org],,
+        [http://www.gnu.org/software/cpio])
 AC_CONFIG_SRCDIR(src/cpio.h)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_PREREQ([2.63])
-AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 dist-shar std-options silent-rules])
+AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 std-options silent-rules])
 
 # Enable silent rules by default:
 AM_SILENT_RULES([yes])
@@ -58,14 +58,12 @@ cpio_PAXUTILS
 # Additional system dependencies (for mingw)
 CPIO_SYSDEP
 CPIO_PACKED_STRUCTS
-AC_SUBST(CPIO_MT_PROG)
 
 AC_ARG_ENABLE(mt,
  AC_HELP_STRING([--enable-mt], [Enable building of mt program]),
- [case $enableval in
-  yes) CPIO_MT_PROG='mt$(EXEEXT)';;
-  no)  ;;
-  esac])
+ [build_mt=$enableval])
+
+AM_CONDITIONAL([CPIO_MT_COND], [test $build_mt = yes])
 
 AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h])
 
diff --git a/doc/.gitignore b/doc/.gitignore
index 2dd81c0..9c9eece 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -22,5 +22,6 @@ genfile.texi
 getdate.texi
 manual
 parse-datetime.texi
+rmt.8
 stamp-vti
 version.texi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 764d472..d3b71c2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,8 +17,16 @@
 # 02110-1301 USA.
 
 info_TEXINFOS = cpio.texi
-man_MANS = cpio.1 mt.1
-EXTRA_DIST = $(man_MANS) gendocs_template
+dist_man_MANS = cpio.1 $(MT_1) $(RMT_8)
+
+if CPIO_MT_COND
+  MT_1=mt.1
+endif
+if PU_RMT_COND
+  RMT_8=rmt.8
+endif
+
+EXTRA_DIST = gendocs_template mt.1 rmt.8
 
 # Make sure you set TEXINPUT 
 manual:
diff --git a/doc/cpio.1 b/doc/cpio.1
index c18cfb4..a3d81ca 100644
--- a/doc/cpio.1
+++ b/doc/cpio.1
@@ -1,4 +1,19 @@
-.TH CPIO 1L \" -*- nroff -*-
+.\" This file is part of GNU cpio. -*- nroff -*-
+.\" Copyright 2014 Free Software Foundation, Inc.
+.\"
+.\" GNU cpio is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" GNU cpio 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 GNU cpio.  If not, see <http://www.gnu.org/licenses/>.
+.TH CPIO 1 "January 28, 2014" "CPIO" "GNU CPIO"
 .SH NAME
 cpio \- copy files to and from archives
 .SH SYNOPSIS
diff --git a/doc/mt.1 b/doc/mt.1
index ee10add..bc26fed 100644
--- a/doc/mt.1
+++ b/doc/mt.1
@@ -1,10 +1,25 @@
-.TH MT 1L \" -*- nroff -*-
+.\" This file is part of GNU cpio. -*- nroff -*-
+.\" Copyright 2014 Free Software Foundation, Inc.
+.\"
+.\" GNU cpio is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" GNU cpio 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 GNU cpio.  If not, see <http://www.gnu.org/licenses/>.
+.TH MT 1 "January 28, 2014" "MT" "GNU CPIO"
 .SH NAME
 mt \- control magnetic tape drive operation
 .SH SYNOPSIS
 .B mt
-[\-V] [\-f device] [\-\-file=device] [\-\-rsh-command=command] [\-\-version]
-operation [count]
+[\fB\-V\fR] [\fB\-f\fR \fIdevice\fR] [\fB\-\-file=\fIdevice\fR] [\fB\-\-rsh-command=\fIcommand\fR] [\fB\-\-version\fR]
+\fIoperation\fR [\fIcount\fR]
 .SH DESCRIPTION
 This manual page
 documents the GNU version of
@@ -16,7 +31,7 @@ which must be one of the tape operations listed below, on a tape
 drive.
 .PP
 The default tape device to operate on is taken from the file
-.I /usr/include/sys/mtio.h
+.B /usr/include/sys/mtio.h
 when
 .B mt
 is compiled.  It can be overridden by giving a device file name in
@@ -37,61 +52,76 @@ accepted.  Not all operations are available on all systems, or work on
 all types of tape drives.
 Some operations optionally take a repeat count, which can be given
 after the operation name and defaults to 1.
-.IP "eof, weof"
+.TP
+.BR eof ", " weof
 Write
 .I count
 EOF marks at current position.
-.IP fsf
+.TP 
+.B fsf
 Forward space
 .I count
 files.
 The tape is positioned on the first block of the next file.
-.IP bsf
+.TP 
+.B bsf
 Backward space
 .I count
 files.
 The tape is positioned on the first block of the next file.
-.IP fsr
+.TP