Revert "Fix build of the manual."

This reverts commit e6a94adeb3.
This commit is contained in:
Mathieu Lirzin 2017-09-27 23:10:55 +02:00
commit d96ede0b09
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
7 changed files with 65 additions and 87 deletions

9
.gitignore vendored
View file

@ -10,18 +10,13 @@ config.status
configure configure
core.scm core.scm
depcomp depcomp
/doc/.dirstamp
/doc/config.texi
/doc/mcron.info
/doc/mcron.1
/doc/stamp-vti
/doc/version.texi
install-sh install-sh
makefile makefile
makefile.in makefile.in
/mcron /mcron
mcron.c mcron.c
/mdate-sh mcron.info
*.o *.o
mcron.texinfo
missing missing
texinfo.tex texinfo.tex

View file

@ -1,14 +1,5 @@
2015-06-26 Mathieu Lirzin <mthl@openmailbox.org> 2015-06-26 Mathieu Lirzin <mthl@openmailbox.org>
Fix build of the manual.
* mcron.texinfo.in: Move to ...
* doc/mcron.texi: ... Here. New file.
* doc/config.texi.in: New file.
* configure.ac: Adapt to it.
* makefile.am: Likewise.
* .gitignore: Likewise.
* README--git: Likewise.
Add missing 'makefile.am'. Add missing 'makefile.am'.
* scm/mcron/makefile.am: New file. * scm/mcron/makefile.am: New file.
* .gitignore: Ignore 'mcron' only in the top-level directory. * .gitignore: Ignore 'mcron' only in the top-level directory.

View file

@ -1,7 +1,6 @@
GNU mcron --- README--git -*-text-*- GNU mcron --- README--git -*-text-*-
Copyright (C) 2012, 2014 Dale Mellor Copyright (C) 2012, 2014 Dale Mellor
Copyright (C) 2015 Mathieu Lirzin
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright are permitted in any medium without royalty provided the copyright
@ -11,9 +10,13 @@ GNU mcron --- README--git -*-text-*-
If you have pulled mcron from the GIT repository, these are the steps you will If you have pulled mcron from the GIT repository, these are the steps you will
need to take to build it the first time: need to take to build it the first time:
1) autoreconf -vfi 1) aclocal
2) ./configure --prefix={wherever} 2) autoconf
3) make install 3) automake -a (will error)
4) ./configure (will error)
5) automake -a
6) ./configure --prefix={wherever}
7) make install
After that it should just be a simple matter of typing `make install' when you After that it should just be a simple matter of typing `make install' when you

View file

@ -3,7 +3,6 @@
# Copyright (C) 2003, 2005, 2012, 2014 Dale Mellor # Copyright (C) 2003, 2005, 2012, 2014 Dale Mellor
# Copyright (C) 2015 Mathieu Lirzin
# #
# This file is part of GNU mcron. # This file is part of GNU mcron.
# #
@ -175,8 +174,6 @@ AC_SUBST(CONFIG_TMP_DIR)
real_program_prefix=`echo $program_prefix | sed s/NONE//` real_program_prefix=`echo $program_prefix | sed s/NONE//`
AC_SUBST(real_program_prefix) AC_SUBST(real_program_prefix)
AC_CONFIG_FILES([doc/config.texi
makefile AC_CONFIG_FILES(mcron.texinfo makefile scm/mcron/makefile scm/mcron/config.scm)
scm/mcron/makefile
scm/mcron/config.scm])
AC_OUTPUT AC_OUTPUT

View file

@ -1,5 +0,0 @@
@set CONFIG_SOCKET_FILE @CONFIG_SOCKET_FILE@
@set CONFIG_SPOOL_DIR @CONFIG_SPOOL_DIR@
@set CONFIG_PID_FILE @CONFIG_PID_FILE@
@set CONFIG_ALLOW_FILE @CONFIG_ALLOW_FILE@
@set CONFIG_DENY_FILE @CONFIG_DENY_FILE@

View file

@ -1,6 +1,5 @@
## Makefile for the toplevel directory of mcron. ## Makefile for the toplevel directory of mcron.
## Copyright (C) 2003 Dale Mellor ## Copyright (C) 2003 Dale Mellor
## Copyright (C) 2015 Mathieu Lirzin
## ##
# This file is part of GNU mcron. # This file is part of GNU mcron.
# #
@ -32,9 +31,9 @@ CLEANFILES = mcron.c
EXTRA_DIST = makefile.ed mcron.c.template BUGS EXTRA_DIST = makefile.ed mcron.c.template BUGS
info_TEXINFOS = doc/mcron.texi info_TEXINFOS = mcron.texinfo
dist_man_MANS = doc/mcron.1 dist_man_MANS = mcron.1
bin_PROGRAMS = mcron bin_PROGRAMS = mcron
mcron_SOURCES = mcron.c mcron_SOURCES = mcron.c
@ -80,6 +79,6 @@ uninstall-hook:
# Not part of formal package building, but a rule for manual use to get the # Not part of formal package building, but a rule for manual use to get the
# elemental man page. Will only work once the mcron program is installed. # elemental man page. Will only work once the mcron program is installed.
$(dist_man_MANS): mcron.c mcron.1 : mcron.c
$(HELP2MAN) -n 'a program to run tasks at regular (or not) intervals' \ $(HELP2MAN) -n 'a program to run tasks at regular (or not) intervals' \
./mcron > $@ ./mcron > mcron.1

View file

@ -1,14 +1,12 @@
\input texinfo \input texinfo
@c %**start of header @c %**start of header
@setfilename mcron.info @setfilename mcron.info
@include config.texi @settitle mcron @VERSION@
@include version.texi
@settitle mcron @value{VERSION}
@c %**end of header @c %**end of header
@syncodeindex fn cp @syncodeindex fn cp
@copying This manual is for GNU mcron (version @value{VERSION}), which is a @copying This manual is for GNU mcron (version @VERSION@), which is a
program for running jobs at scheduled times. program for running jobs at scheduled times.
Copyright @copyright{} 2003, 2005, 2006, 2012, 2014 Dale Mellor Copyright @copyright{} 2003, 2005, 2006, 2012, 2014 Dale Mellor
@ -70,36 +68,36 @@ running jobs at scheduled times.
Simple examples Simple examples
* Guile Simple Examples:: * Guile Simple Examples::
* Vixie Simple Examples:: * Vixie Simple Examples::
Full available syntax Full available syntax
* Guile Syntax:: * Guile Syntax::
* Extended Guile examples:: * Extended Guile examples::
* Vixie Syntax:: * Vixie Syntax::
Extended Guile examples Extended Guile examples
* AT commands:: * AT commands::
* Every second Sunday:: * Every second Sunday::
* Two hours every day:: * Two hours every day::
* Missing the first appointment:: * Missing the first appointment::
* Penultimate day of every month:: * Penultimate day of every month::
Vixie Vixie
* Paul Vixie's copyright:: * Paul Vixie's copyright::
* Crontab file:: * Crontab file::
* Incompatibilities with old Unices:: * Incompatibilities with old Unices::
Detailed invoking Detailed invoking
* Invoking mcron:: * Invoking mcron::
* Invoking cron or crond:: * Invoking cron or crond::
* Invoking crontab:: * Invoking crontab::
* Behaviour on laptops:: * Behaviour on laptops::
* Exit codes:: * Exit codes::
Guile modules Guile modules
@ -184,8 +182,8 @@ been to allow such simple specifications to be made easily. The
examples show how to create the command descriptions, and subsequently examples show how to create the command descriptions, and subsequently
how to run mcron to make them happen. how to run mcron to make them happen.
@menu @menu
* Guile Simple Examples:: * Guile Simple Examples::
* Vixie Simple Examples:: * Vixie Simple Examples::
@end menu @end menu
@node Guile Simple Examples, Vixie Simple Examples, Simple examples, Simple examples @node Guile Simple Examples, Vixie Simple Examples, Simple examples, Simple examples
@ -260,9 +258,9 @@ on your system, as root.
@node Syntax, Invoking, Simple examples, Top @node Syntax, Invoking, Simple examples, Top
@chapter Full available syntax @chapter Full available syntax
@menu @menu
* Guile Syntax:: * Guile Syntax::
* Extended Guile examples:: * Extended Guile examples::
* Vixie Syntax:: * Vixie Syntax::
@end menu @end menu
@node Guile Syntax, Extended Guile examples, Syntax, Syntax @node Guile Syntax, Extended Guile examples, Syntax, Syntax
@section Guile Syntax @section Guile Syntax
@ -394,11 +392,11 @@ they seem. The following examples illustrate some pitfalls, and
demonstrate how to code around them. demonstrate how to code around them.
@menu @menu
* AT commands:: * AT commands::
* Every second Sunday:: * Every second Sunday::
* Two hours every day:: * Two hours every day::
* Missing the first appointment:: * Missing the first appointment::
* Penultimate day of every month:: * Penultimate day of every month::
@end menu @end menu
@node AT commands, Every second Sunday, Extended Guile examples, Extended Guile examples @node AT commands, Every second Sunday, Extended Guile examples, Extended Guile examples
@ -547,9 +545,9 @@ the variable and runs the command in the user's default shell, as
advertised by the /etc/passwd file. advertised by the /etc/passwd file.
@menu @menu
* Paul Vixie's copyright:: * Paul Vixie's copyright::
* Crontab file:: * Crontab file::
* Incompatibilities with old Unices:: * Incompatibilities with old Unices::
@end menu @end menu
@ -798,11 +796,11 @@ place in the part which implements the mcron personality.
@menu @menu
* Invoking mcron:: * Invoking mcron::
* Invoking cron or crond:: * Invoking cron or crond::
* Invoking crontab:: * Invoking crontab::
* Behaviour on laptops:: * Behaviour on laptops::
* Exit codes:: * Exit codes::
@end menu @end menu
@node Invoking mcron, Invoking cron or crond, Invoking, Invoking @node Invoking mcron, Invoking cron or crond, Invoking, Invoking
@ -895,21 +893,21 @@ standard output.
@cindex invoking cron @cindex invoking cron
@cindex crond, invokation @cindex crond, invokation
@cindex invoking crond @cindex invoking crond
@cindex @value{CONFIG_SPOOL_DIR} @cindex @CONFIG_SPOOL_DIR@
@cindex @value{CONFIG_SOCKET_FILE} @cindex @CONFIG_SOCKET_FILE@
NOTE THAT THIS SECTION ONLY APPLIES IF THE @code{cron} or NOTE THAT THIS SECTION ONLY APPLIES IF THE @code{cron} or
@code{crond}, and @code{crontab} PROGRAMS HAVE BEEN INSTALLED BY THE @code{crond}, and @code{crontab} PROGRAMS HAVE BEEN INSTALLED BY THE
SYSTEM ADMINISTRATOR. SYSTEM ADMINISTRATOR.
If the program runs by the name of @code{cron} or @code{crond}, then If the program runs by the name of @code{cron} or @code{crond}, then
it will read all the files in @code{@value{CONFIG_SPOOL_DIR}} (which it will read all the files in @code{@CONFIG_SPOOL_DIR@} (which should only
should only be readable by root) and the file @code{/etc/crontab}, and be readable by root) and the file @code{/etc/crontab}, and then
then detaches itself from the terminal to live forever as a daemon detaches itself from the terminal to live forever as a daemon
process. Additionally, it creates a UNIX socket at process. Additionally, it creates a UNIX socket at
@code{@value{CONFIG_SOCKET_FILE}}, and listens for messages sent to @code{@CONFIG_SOCKET_FILE@}, and listens for messages sent to that socket
that socket consisting of a user name whose crontabs have been consisting of a user name whose crontabs have been changed. In this
changed. In this case, the program will re-read that user's crontab. case, the program will re-read that user's crontab. This is for
This is for correct functioning with the crontab program. correct functioning with the crontab program.
Further, if the @code{--noetc} option was not used, a job is scheduled Further, if the @code{--noetc} option was not used, a job is scheduled
to run every minute to check if /etc/crontab has been modified to run every minute to check if /etc/crontab has been modified
@ -1062,7 +1060,7 @@ No problems.
@item 1 @item 1
An attempt has been made to start cron but there is already a An attempt has been made to start cron but there is already a
@value{CONFIG_PID_FILE} file. If there really is no other cron daemon @CONFIG_PID_FILE@ file. If there really is no other cron daemon
running (this does not include invokations of mcron) then you should running (this does not include invokations of mcron) then you should
remove this file before attempting to run cron. remove this file before attempting to run cron.
@ -1080,9 +1078,9 @@ to be specified in one of these forms.
@item 4 @item 4
An attempt to run cron has been made by a user who does not have An attempt to run cron has been made by a user who does not have
permission to access the crontabs in @value{CONFIG_SPOOL_DIR}. These permission to access the crontabs in @CONFIG_SPOOL_DIR@. These files
files should be readable only by root, and the cron daemon must be run should be readable only by root, and the cron daemon must be run as
as root. root.
@item 5 @item 5
An attempt to run mcron has been made, but there are no jobs to An attempt to run mcron has been made, but there are no jobs to
@ -1090,7 +1088,7 @@ schedule!
@item 6 @item 6
The system administrator has blocked this user from using crontab with The system administrator has blocked this user from using crontab with
the files @value{CONFIG_ALLOW_FILE} and @value{CONFIG_DENY_FILE}. the files @CONFIG_ALLOW_FILE@ and @CONFIG_DENY_FILE@.
@item 7 @item 7
Crontab has been run with more than one of the arguments @code{-l}, Crontab has been run with more than one of the arguments @code{-l},
@ -1250,7 +1248,7 @@ This module is introduced to a program with the command
@code{(use-modules (mcron redirect))}. @code{(use-modules (mcron redirect))}.
This module provides the @code{with-mail-out} function, described This module provides the @code{with-mail-out} function, described
fully in @ref{Guile Syntax}. fully in @ref{Guile Syntax}.
@node The vixie-time module, The job-specifier module, The redirect module, Guile modules @node The vixie-time module, The job-specifier module, The redirect module, Guile modules
@section The vixie-time module @section The vixie-time module
@ -1327,7 +1325,7 @@ return silently. Otherwise, the behaviour is identical to
Once this module has been declared in a program, a crontab file can be Once this module has been declared in a program, a crontab file can be
used to augment the current job list with a call to used to augment the current job list with a call to
@code{read-vixie-file}. @code{read-vixie-file}.
@node Index, , Guile modules, Top @node Index, , Guile modules, Top
@unnumbered Index @unnumbered Index