From f8130256b5c4b62e3c39b0d6b6c12d3c1d6ce5e8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 2 Feb 2021 15:06:05 +0200 Subject: [PATCH 15/16] Main Makefile.am: Add docs to EXTRA_DIST Autotools were already automatically adding most documents to dist, but ChangeLog-1.0-S3_0 was not. This also makes it simpler to add NEWS-x.y files in release branches. See osdn #41428 Signed-off-by: Marko Lindqvist --- Makefile.am | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index ad13db1d17..c2764d140f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,16 @@ endif SUBDIRS = gen_headers $(DSUBDIRS) dependencies utility common tests windows $(SSUBDIRS) $(CSUBDIRS) translations doc tools lua bootstrap +docs = \ + ABOUT-NLS \ + AUTHORS \ + ChangeLog \ + ChangeLog-1.0-S3_0 \ + COPYING \ + INSTALL \ + NEWS +# On branch: add NEWS-x.x here and remove this comment + EXTRA_DIST = autogen.sh \ configure.ac \ m4/c99.m4 \ @@ -79,20 +89,10 @@ EXTRA_DIST = autogen.sh \ scripts/setup_auth_server.sh \ scripts/replace \ scripts/diff_ignore \ - scripts/freeciv.supp -# On branch: add NEWS-x.x here and remove this comment (1 of 2) + scripts/freeciv.supp \ + $(docs) -noinst_HEADERS= fc_version - -docs = \ - ABOUT-NLS \ - AUTHORS \ - ChangeLog \ - ChangeLog-1.0-S3_0 \ - COPYING \ - INSTALL \ - NEWS -# On branch: add NEWS-x.x here and remove this comment (2 of 2) +noinst_HEADERS = fc_version doc_DATA = $(docs) -- 2.30.0