summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2014-01-28 19:23:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2014-01-28 19:27:35 (GMT)
commit69014cd645779484724d579fc0d302bbaf146ff2 (patch) (side-by-side diff)
treee72caa39581288eda35910746a5810f74eef3d4b
parentccec71ec318fdf739f55858d5bffaf4fd6520036 (diff)
downloadcpio-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS10
-rwxr-xr-xbootstrap1
-rw-r--r--configure.ac18
-rw-r--r--doc/.gitignore1
-rw-r--r--doc/Makefile.am12
-rw-r--r--doc/cpio.117
-rw-r--r--doc/mt.197
-rw-r--r--lib/Makefile.am2
-rw-r--r--src/Makefile.am8
-rw-r--r--tests/Makefile.am5
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
+.B fsr
Forward space
.I count
records.
-.IP bsr
+.TP
+.B bsr
Backward space
.I count
records.
-.IP bsfm
+.TP
+.B bsfm
Backward space
.I count
file marks.
The tape is positioned on the beginning-of-the-tape side of
the file mark.
-.IP fsfm
+.TP
+.B fsfm
Forward space
.I count
file marks.
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
.IR count .
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.
.PP
.B mt
@@ -100,7 +130,7 @@ operation or device name given was invalid, or 2 if the operation
failed.
.SS OPTIONS
.TP
-.I "\-f, \-\-file=device"
+\fB\-f\fR, \fB\-\-file=\fIdevice\fR
Use
.I device
as the file name of the tape drive to operate on.
@@ -111,16 +141,35 @@ username and an `@' to access the remote tape drive as that user, if
you have permission to do so (typically an entry in that user's
`~/.rhosts' file).
.TP
-.I "\-\-rsh-command=command"
+\fB\-\-rsh-command=\fIcommand\fR
Notifies
.B mt
that it should use
.I command
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
@@ -26,7 +26,7 @@ rmt-command.h : Makefile
$(AM_V_at)mv $@-t $@
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
noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h
libpax_a_SOURCES = \
diff --git a/src/Makefile.am b/src/Makefile.am
index ec71397..fea4264 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,9 +17,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA.
-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
cpio_SOURCES = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b63b545..87716de 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -85,8 +85,9 @@ check_PROGRAMS = genfile
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)\"
LDADD=../gnu/libgnu.a @LIB_CLOCK_GETTIME@ @INTLLIBS@

Return to:

Send suggestions and report system problems to the System administrator.