summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-02-20 10:56:17 +0100
committerJim Meyering <meyering@redhat.com>2011-03-26 14:20:28 +0100
commitf266434caff7a4657c6bc8f54edd51f3f04de39a (patch)
treeee0dcb85aab8d4d0e92014bf44a3bc4657947bfd
parent94e032f9416dbc56d412e06b2b8a3e342a21b91b (diff)
downloadpatch-f266434caff7a4657c6bc8f54edd51f3f04de39a.tar.gz
maint: arrange for the sc_require_config_h_first test to pass
* cfg.mk: New file, to configure maint.mk. * Makefile.am (EXTRA_DIST): Add, so the new file is distributed. (config_h_header): Define, to make the sc_require_config_h_first syntax-check test pass. * pc/chdirsaf.c: Include <config.h>.
-rw-r--r--Makefile.am1
-rw-r--r--cfg.mk21
-rw-r--r--pc/chdirsaf.c1
3 files changed, 23 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 918c5eb..2cb86da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS = lib src tests
dist_man1_MANS = patch.man
EXTRA_DIST = \
ChangeLog-2011 \
+ cfg.mk \
m4/mkdir.m4 \
m4/setmode.m4 \
m4/utimbuf.m4 \
diff --git a/cfg.mk b/cfg.mk
new file mode 100644
index 0000000..819c1b5
--- /dev/null
+++ b/cfg.mk
@@ -0,0 +1,21 @@
+# Customize maint.mk -*- makefile -*-
+# Copyright (C) 2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+config_h_header = <(common|config)\.h>
+
+update-copyright-env = \
+ UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
diff --git a/pc/chdirsaf.c b/pc/chdirsaf.c
index 0598f78..8ad0591 100644
--- a/pc/chdirsaf.c
+++ b/pc/chdirsaf.c
@@ -1,6 +1,7 @@
/* A safer version of chdir, which returns back to the
initial working directory when the program exits. */
+#include <config.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>