Upgrade grecs

7 files changed, 10 insertions, 10 deletions

diff --git a/README b/README
index de21198..ee890a4 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 Cfpeek README
-Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 * Introduction
 
 This file contains brief information about configuring, testing
 and running Cfpeek. It is *not* intended as a replacement
@@ -59,13 +58,13 @@ use Guile-specific default directory.
 
 Send bug reports to <bug-cfpeek@gnu.org.ua>. 
 
 
 * Copyright information:
 
-Copyright (C) 2011 Sergey Poznyakoff
+Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/README-hacking b/README-hacking
index a9ac074..a492e37 100644
--- a/README-hacking
+++ b/README-hacking
@@ -33,13 +33,13 @@ which are extracted from other source packages:
 Once done, proceed as described in the file README (section
 Building).
 
 
 * Copyright information
 
-Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff
+Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a0a508c..31d777c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of cfpeek
-# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff
+# Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff
 #
 # Cfpeek 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, or (at your option)
 # any later version.
 #
@@ -50,21 +50,21 @@ imprimatur_INPUT=$(info_TEXINFOS) $(cfpeek_TEXINFOS)
 include ../imprimatur/imprimatur.mk
 CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh
 
 GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
 EXTRA_DIST += gendocs.sh
 
-TEXI2DVI=texi2dvi -t '@set $(RENDITION)'
+TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 
 # Make sure you set TEXINPUTS.
 # TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions
 .PHONY: manual
 manual:
         TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
          MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \
-         TEXI2DVI="$(TEXI2DVI) -E" \
+         TEXI2DVI="$(TEXI2DVI)" \
          $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
 
 # Checking
 check-options:
         @$(CHECK_DOCS) options \
            '/OPTIONS_BEGIN/,/OPTIONS_END/s/OPTION( *\([^,][^,]*\),.*/\1/pg' \
diff --git a/grecs b/grecs
-Subproject 2dbad2727f1d00b223353965b326cfffa96fc77
+Subproject dae43f323db9578e656e3a6c53440e2365421af
diff --git a/src/cfpeek.c b/src/cfpeek.c
index da195d7..6001b9a 100644
--- a/src/cfpeek.c
+++ b/src/cfpeek.c
@@ -1,8 +1,8 @@
 /* This file is part of cfpeek
-   Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff
+   Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff
 
    Cfpeek 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, or (at your option)
    any later version.
 
@@ -13,13 +13,13 @@
 
    You should have received a copy of the GNU General Public License
    along with cfpeek.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "cfpeek.h"
-#include "grecs-locus.h"
+#include "grecs/locus.h"
 
 int file_index;
 int flags;
 int quiet_option;
 int reduce_option;
 int sort_option;
diff --git a/src/cfpeek.h b/src/cfpeek.h
index 5346794..5b6a686 100644
--- a/src/cfpeek.h
+++ b/src/cfpeek.h
@@ -1,8 +1,8 @@
 /* This file is part of cfpeek
-   Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff
+   Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff
 
    Cfpeek 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, or (at your option)
    any later version.
 
@@ -15,12 +15,13 @@
    along with cfpeek.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <sysexits.h>
 #include "grecs.h"
 #include "wordsplit.h"
 
diff --git a/src/cmdline.opt b/src/cmdline.opt
index ecf67c1..15c0c16 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -187,13 +187,13 @@ set_flag(const char *str)
 }
 
 OPTIONS_BEGIN("cfpeek",
               [<Get variables from a configuration file>],
               [<FILE [PATH...]>],
               [<gnu>],
-              [<copyright_year=2011,2012>],
+              [<copyright_year=2011-2018>],
               [<copyright_holder=Sergey Poznyakoff>])
 
 GROUP(Output control)
 
 OPTION(format,H,[<FLAGS>],
        [<set output format flags [*]>])