diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:24:45 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:25:56 -0800 |
| commit | 751989772768fe787ec0bb02929c3d2a49805388 (patch) | |
| tree | dce15df0bb09c63f684efa2ef0a0eb22f992b13d /lib | |
| parent | d263ce25cd3a751b510abcc8bc67b0ee1ffa96d5 (diff) | |
| download | emacs-751989772768fe787ec0bb02929c3d2a49805388.tar.gz | |
Merge from gnulib, mostly to fix copyright years
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fsusage.c | 4 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/fsusage.c b/lib/fsusage.c index 3482c5f3ac3..6920f8530a1 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -1,7 +1,7 @@ /* fsusage.c -- return space usage of mounted file systems - Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2018 Free - Software Foundation, Inc. + Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2018 Free Software + Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index d7300614828..49f4d236e44 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -540,6 +540,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ +JSON_CFLAGS = @JSON_CFLAGS@ +JSON_LIBS = @JSON_LIBS@ +JSON_OBJ = @JSON_OBJ@ KQUEUE_CFLAGS = @KQUEUE_CFLAGS@ KQUEUE_LIBS = @KQUEUE_LIBS@ KRB4LIB = @KRB4LIB@ @@ -945,7 +948,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ |