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,10 +1,14 @@ | |||
1 | GNU cpio NEWS -- history of user-visible changes. 2010-03-10 | 1 | GNU cpio NEWS -- history of user-visible changes. 2014-01-28 |
2 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, | 2 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, |
3 | 2010 Free Software Foundation, Inc. | 3 | 2010, 2014 Free Software Foundation, Inc. |
4 | See the end of file for copying conditions. | 4 | See the end of file for copying conditions. |
5 | 5 | ||
6 | Please send cpio bug reports to <bug-cpio@gnu.org>. | 6 | Please send cpio bug reports to <bug-cpio@gnu.org>. |
7 | 7 | ||
8 | Version 2.11.90 - Git | ||
9 | |||
10 | |||
11 | |||
8 | Version 2.11 - Sergey Poznyakoff, 2010-03-10 | 12 | Version 2.11 - Sergey Poznyakoff, 2010-03-10 |
9 | 13 | ||
10 | * Fix mt build. | 14 | * Fix mt build. |
@@ -165,7 +169,7 @@ multiple links and of multi-volume archives on floppy disks. | |||
165 | Copyright information: | 169 | Copyright information: |
166 | 170 | ||
167 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, | 171 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, |
168 | 2010 Free Software Foundation, Inc. | 172 | 2010, 2014 Free Software Foundation, Inc. |
169 | 173 | ||
170 | Permission is granted to anyone to make or distribute verbatim copies | 174 | Permission is granted to anyone to make or distribute verbatim copies |
171 | of this document as received, in any medium, provided that the | 175 | of this document as received, in any medium, provided that the |
@@ -110,7 +110,6 @@ tests_base=tests | |||
110 | # Extra files from gnulib, which override files from other sources. | 110 | # Extra files from gnulib, which override files from other sources. |
111 | gnulib_extra_files=" | 111 | gnulib_extra_files=" |
112 | $build_aux/install-sh | 112 | $build_aux/install-sh |
113 | $build_aux/missing | ||
114 | $build_aux/mdate-sh | 113 | $build_aux/mdate-sh |
115 | $build_aux/texinfo.tex | 114 | $build_aux/texinfo.tex |
116 | $build_aux/depcomp | 115 | $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 @@ | |||
1 | dnl Process this file with autoconf to produce a configure script. | 1 | dnl Process this file with autoconf to produce a configure script. |
2 | dnl This file is part of GNU cpio | 2 | dnl This file is part of GNU cpio |
3 | dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software | 3 | dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2014 Free Software |
4 | dnl Foundation, Inc. | 4 | dnl Foundation, Inc. |
5 | dnl | 5 | dnl |
6 | dnl This program is free software; you can redistribute it and/or modify | 6 | 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 | |||
14 | dnl GNU General Public License for more details. | 14 | dnl GNU General Public License for more details. |
15 | dnl | 15 | dnl |
16 | dnl You should have received a copy of the GNU General Public License | 16 | dnl You should have received a copy of the GNU General Public License |
17 | dnl along with this program; if not, write to the Free Software Foundation, | 17 | dnl along with this program. If not, see <http://www.gnu.org/licenses/>. |
18 | dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
19 | 18 | ||
20 | AC_INIT([GNU cpio], [2.11], [bug-cpio@gnu.org]) | 19 | AC_INIT([GNU cpio], [2.11.90], [bug-cpio@gnu.org],, |
20 | [http://www.gnu.org/software/cpio]) | ||
21 | AC_CONFIG_SRCDIR(src/cpio.h) | 21 | AC_CONFIG_SRCDIR(src/cpio.h) |
22 | AC_CONFIG_AUX_DIR([build-aux]) | 22 | AC_CONFIG_AUX_DIR([build-aux]) |
23 | AC_CONFIG_HEADERS([config.h]) | 23 | AC_CONFIG_HEADERS([config.h]) |
24 | AC_PREREQ([2.63]) | 24 | AC_PREREQ([2.63]) |
25 | AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 dist-shar std-options silent-rules]) | 25 | AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 std-options silent-rules]) |
26 | 26 | ||
27 | # Enable silent rules by default: | 27 | # Enable silent rules by default: |
28 | AM_SILENT_RULES([yes]) | 28 | AM_SILENT_RULES([yes]) |
@@ -58,14 +58,12 @@ cpio_PAXUTILS | |||
58 | # Additional system dependencies (for mingw) | 58 | # Additional system dependencies (for mingw) |
59 | CPIO_SYSDEP | 59 | CPIO_SYSDEP |
60 | CPIO_PACKED_STRUCTS | 60 | CPIO_PACKED_STRUCTS |
61 | AC_SUBST(CPIO_MT_PROG) | ||
62 | 61 | ||
63 | AC_ARG_ENABLE(mt, | 62 | AC_ARG_ENABLE(mt, |
64 | AC_HELP_STRING([--enable-mt], [Enable building of mt program]), | 63 | AC_HELP_STRING([--enable-mt], [Enable building of mt program]), |
65 | [case $enableval in | 64 | [build_mt=$enableval]) |
66 | yes) CPIO_MT_PROG='mt$(EXEEXT)';; | 65 | |
67 | no) ;; | 66 | AM_CONDITIONAL([CPIO_MT_COND], [test $build_mt = yes]) |
68 | esac]) | ||
69 | 67 | ||
70 | 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]) | 68 | 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]) |
71 | 69 | ||
diff --git a/doc/.gitignore b/doc/.gitignore index 2dd81c0..9c9eece 100644 --- a/doc/.gitignore +++ b/doc/.gitignore | |||
@@ -22,5 +22,6 @@ genfile.texi | |||
22 | getdate.texi | 22 | getdate.texi |
23 | manual | 23 | manual |
24 | parse-datetime.texi | 24 | parse-datetime.texi |
25 | rmt.8 | ||
25 | stamp-vti | 26 | stamp-vti |
26 | version.texi | 27 | 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 @@ | |||
17 | # 02110-1301 USA. | 17 | # 02110-1301 USA. |
18 | 18 | ||
19 | info_TEXINFOS = cpio.texi | 19 | info_TEXINFOS = cpio.texi |
20 | man_MANS = cpio.1 mt.1 | 20 | dist_man_MANS = cpio.1 $(MT_1) $(RMT_8) |
21 | EXTRA_DIST = $(man_MANS) gendocs_template | 21 | |
22 | if CPIO_MT_COND | ||
23 | MT_1=mt.1 | ||
24 | endif | ||
25 | if PU_RMT_COND | ||
26 | RMT_8=rmt.8 | ||
27 | endif | ||
28 | |||
29 | EXTRA_DIST = gendocs_template mt.1 rmt.8 | ||
22 | 30 | ||
23 | # Make sure you set TEXINPUT | 31 | # Make sure you set TEXINPUT |
24 | manual: | 32 | manual: |
@@ -1,4 +1,19 @@ | |||
1 | .TH CPIO 1L \" -*- nroff -*- | 1 | .\" This file is part of GNU cpio. -*- nroff -*- |
2 | .\" Copyright 2014 Free Software Foundation, Inc. | ||
3 | .\" | ||
4 | .\" GNU cpio is free software; you can redistribute it and/or modify | ||
5 | .\" it under the terms of the GNU General Public License as published by | ||
6 | .\" the Free Software Foundation; either version 3 of the License, or | ||
7 | .\" (at your option) any later version. | ||
8 | .\" | ||
9 | .\" GNU cpio is distributed in the hope that it will be useful, | ||
10 | .\" but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | .\" GNU General Public License for more details. | ||
13 | .\" | ||
14 | .\" You should have received a copy of the GNU General Public License | ||
15 | .\" along with GNU cpio. If not, see <http://www.gnu.org/licenses/>. | ||
16 | .TH CPIO 1 "January 28, 2014" "CPIO" "GNU CPIO" | ||
2 | .SH NAME | 17 | .SH NAME |
3 | cpio \- copy files to and from archives | 18 | cpio \- copy files to and from archives |
4 | .SH SYNOPSIS | 19 | .SH SYNOPSIS |
@@ -1,10 +1,25 @@ | |||
1 | .TH MT 1L \" -*- nroff -*- | 1 | .\" This file is part of GNU cpio. -*- nroff -*- |
2 | .\" Copyright 2014 Free Software Foundation, Inc. | ||
3 | .\" | ||
4 | .\" GNU cpio is free software; you can redistribute it and/or modify | ||
5 | .\" it under the terms of the GNU General Public License as published by | ||
6 | .\" the Free Software Foundation; either version 3 of the License, or | ||
7 | .\" (at your option) any later version. | ||
8 | .\" | ||
9 | .\" GNU cpio is distributed in the hope that it will be useful, | ||
10 | .\" but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | .\" GNU General Public License for more details. | ||
13 | .\" | ||
14 | .\" You should have received a copy of the GNU General Public License | ||
15 | .\" along with GNU cpio. If not, see <http://www.gnu.org/licenses/>. | ||
16 | .TH MT 1 "January 28, 2014" "MT" "GNU CPIO" | ||
2 | .SH NAME | 17 | .SH NAME |
3 | mt \- control magnetic tape drive operation | 18 | mt \- control magnetic tape drive operation |
4 | .SH SYNOPSIS | 19 | .SH SYNOPSIS |
5 | .B mt | 20 | .B mt |
6 | [\-V] [\-f device] [\-\-file=device] [\-\-rsh-command=command] [\-\-version] | 21 | [\fB\-V\fR] [\fB\-f\fR \fIdevice\fR] [\fB\-\-file=\fIdevice\fR] [\fB\-\-rsh-command=\fIcommand\fR] [\fB\-\-version\fR] |
7 | operation [count] | 22 | \fIoperation\fR [\fIcount\fR] |
8 | .SH DESCRIPTION | 23 | .SH DESCRIPTION |
9 | This manual page | 24 | This manual page |
10 | documents the GNU version of | 25 | documents the GNU version of |
@@ -16,7 +31,7 @@ which must be one of the tape operations listed below, on a tape | |||
16 | drive. | 31 | drive. |
17 | .PP | 32 | .PP |
18 | The default tape device to operate on is taken from the file | 33 | The default tape device to operate on is taken from the file |
19 | .I /usr/include/sys/mtio.h | 34 | .B /usr/include/sys/mtio.h |
20 | when | 35 | when |
21 | .B mt | 36 | .B mt |
22 | is compiled. It can be overridden by giving a device file name in | 37 | 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 | |||
37 | all types of tape drives. | 52 | all types of tape drives. |
38 | Some operations optionally take a repeat count, which can be given | 53 | Some operations optionally take a repeat count, which can be given |
39 | after the operation name and defaults to 1. | 54 | after the operation name and defaults to 1. |
40 | .IP "eof, weof" | 55 | .TP |
56 | .BR eof ", " weof | ||
41 | Write | 57 | Write |
42 | .I count | 58 | .I count |
43 | EOF marks at current position. | 59 | EOF marks at current position. |
44 | .IP fsf | 60 | .TP |
61 | .B fsf | ||
45 | Forward space | 62 | Forward space |
46 | .I count | 63 | .I count |
47 | files. | 64 | files. |
48 | The tape is positioned on the first block of the next file. | 65 | The tape is positioned on the first block of the next file. |
49 | .IP bsf | 66 | .TP |
67 | .B bsf | ||
50 | Backward space | 68 | Backward space |
51 | .I count | 69 | .I count |
52 | files. | 70 | files. |
53 | The tape is positioned on the first block of the next file. | 71 | The tape is positioned on the first block of the next file. |
54 | .IP fsr | 72 | .TP |