diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-01-28 21:23:53 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-01-28 21:27:35 +0200 |
commit | 69014cd645779484724d579fc0d302bbaf146ff2 (patch) | |
tree | e72caa39581288eda35910746a5810f74eef3d4b | |
parent | ccec71ec318fdf739f55858d5bffaf4fd6520036 (diff) | |
download | cpio-69014cd645779484724d579fc0d302bbaf146ff2.tar.gz cpio-69014cd645779484724d579fc0d302bbaf146ff2.tar.bz2 |
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.
-rw-r--r-- | NEWS | 10 | ||||
-rwxr-xr-x | bootstrap | 1 | ||||
-rw-r--r-- | configure.ac | 18 | ||||
-rw-r--r-- | doc/.gitignore | 1 | ||||
-rw-r--r-- | doc/Makefile.am | 12 | ||||
-rw-r--r-- | doc/cpio.1 | 17 | ||||
-rw-r--r-- | doc/mt.1 | 97 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | tests/Makefile.am | 5 |
10 files changed, 125 insertions, 46 deletions
@@ -1,4 +1,4 @@ -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. @@ -7,2 +7,6 @@ Please send cpio bug reports to <bug-cpio@gnu.org>. +Version 2.11.90 - Git + + + Version 2.11 - Sergey Poznyakoff, 2010-03-10 @@ -167,3 +171,3 @@ Copyright information: Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, -2010 Free Software Foundation, Inc. +2010, 2014 Free Software Foundation, Inc. @@ -112,3 +112,2 @@ gnulib_extra_files=" $build_aux/install-sh - $build_aux/missing $build_aux/mdate-sh diff --git a/configure.ac b/configure.ac index e55c25e..1d3d985 100644 --- a/configure.ac +++ b/configure.ac @@ -2,3 +2,3 @@ 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. @@ -16,6 +16,6 @@ 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) @@ -24,3 +24,3 @@ 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]) @@ -60,3 +60,2 @@ CPIO_SYSDEP CPIO_PACKED_STRUCTS -AC_SUBST(CPIO_MT_PROG) @@ -64,6 +63,5 @@ 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]) diff --git a/doc/.gitignore b/doc/.gitignore index 2dd81c0..9c9eece 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -24,2 +24,3 @@ manual parse-datetime.texi +rmt.8 stamp-vti diff --git a/doc/Makefile.am b/doc/Makefile.am index 764d472..d3b71c2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,4 +19,12 @@ 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 @@ -1,2 +1,17 @@ -.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 @@ -1,2 +1,17 @@ -.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 @@ -5,4 +20,4 @@ mt \- control magnetic tape drive operation .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 @@ -18,3 +33,3 @@ drive. 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 @@ -39,3 +54,4 @@ 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 @@ -43,3 +59,4 @@ Write EOF marks at current position. -.IP fsf +.TP +.B fsf Forward space @@ -48,3 +65,4 @@ files. The tape is positioned on the first block of the next file. -.IP bsf +.TP +.B bsf Backward space @@ -53,3 +71,4 @@ files. The tape is positioned on the first block of the next file. -.IP fsr +.TP +.B fsr Forward space @@ -57,3 +76,4 @@ Forward space records. -.IP bsr +.TP +.B bsr Backward space @@ -61,3 +81,4 @@ Backward space records. -.IP bsfm +.TP +.B bsfm Backward space @@ -67,3 +88,4 @@ The tape is positioned on the beginning-of-the-tape side of the file mark. -.IP fsfm +.TP +.B fsfm Forward space @@ -73,3 +95,4 @@ The tape is positioned on the beginning-of-the-tape side of the file mark. -.IP asf +.TP +.B asf Absolute space to file number @@ -78,18 +101,25 @@ Equivalent to rewind followed by fsf .IR count . -.IP seek +.TP +.B seek Seek to block number .IR count . -.IP eom +.TP +.B eom Space to the end of the recorded media on the tape (for appending files onto tapes). -.IP rewind +.TP +.B rewind Rewind the tape. -.IP "offline, rewoffl" +.TP +.BR offline ", " rewoffl Rewind the tape and, if applicable, unload the tape. -.IP status +.TP +.B status Print status information about the tape unit. -.IP retension +.TP +.B retension Rewind the tape, then wind it to the end of the reel, then rewind it again. -.IP erase +.TP +.B erase Erase the tape. @@ -102,3 +132,3 @@ failed. .TP -.I "\-f, \-\-file=device" +\fB\-f\fR, \fB\-\-file=\fIdevice\fR Use @@ -113,3 +143,3 @@ you have permission to do so (typically an entry in that user's .TP -.I "\-\-rsh-command=command" +\fB\-\-rsh-command=\fIcommand\fR Notifies @@ -119,8 +149,27 @@ that it should use to communicate with remote devices instead of -.I /usr/bin/ssh +.B /usr/bin/ssh or -.IR /usr/bin/rsh . +.BR /usr/bin/rsh . .TP -.I "\-V, \-\-version" +\fB\-V\fR, \fB\-\-version\fR Print the version number of .BR mt . +.SH "BUG REPORTS" +Report bugs to <bug\-cpio@gnu.org>. +.SH COPYRIGHT +Copyright \(co 2014 Free Software Foundation, Inc. +.br +.na +License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> +.br +.ad +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. +.\" Local variables: +.\" eval: (add-hook 'write-file-hooks 'time-stamp) +.\" time-stamp-start: ".TH [A-Z_][A-Z0-9_.\\-]* [0-9] \"" +.\" time-stamp-format: "%:B %:d, %:y" +.\" time-stamp-end: "\"" +.\" time-stamp-line-limit: 20 +.\" end: + diff --git a/lib/Makefile.am b/lib/Makefile.am index 74e25c4..e202b0f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -28,3 +28,3 @@ BUILT_SOURCES = rmt-command.h CLEANFILES = rmt-command.h rmt-command.h-t -INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu +AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu diff --git a/src/Makefile.am b/src/Makefile.am index ec71397..fea4264 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,5 +19,9 @@ -INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CPPFLAGS=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib + +bin_PROGRAMS=cpio $(CPIO_MT) +if CPIO_MT_COND + CPIO_MT=mt +endif -bin_PROGRAMS=cpio @CPIO_MT_PROG@ EXTRA_PROGRAMS=mt diff --git a/tests/Makefile.am b/tests/Makefile.am index b63b545..87716de 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -87,4 +87,5 @@ genfile_SOURCES = genfile.c argcv.c argcv.h localedir = $(datadir)/locale -INCLUDES = -I$(top_srcdir)/gnu -I../gnu -I$(top_srcdir)/lib -AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" +AM_CPPFLAGS = \ + -I$(top_srcdir)/gnu -I../gnu -I$(top_srcdir)/lib\ + -DLOCALEDIR=\"$(localedir)\" |