>From e64729023df43c192f7e67c6c17549d68604a8e6 Mon Sep 17 00:00:00 2001 Message-Id:
From: Stefano Lattarini Date: Sat, 25 Feb 2012 14:38:22 +0100 Subject: [PATCH] docs: improve 'dist-hook' documentation * doc/automake.texi (The dist Hook): Explicitly document the fact that the dist-hook should account for the case where the source tree is read-only, mostly for the benefit of distcheck. Since we are at it, do some minor unrelated rewordings, and remove obsolescent advice. Motivated by the discussion on automake bug#10878. * tests/disthook-perms.test: Renamed ... * tests/disthook.test: ... to this, and extended. * tests/list-of-tests.mk: Adjust. --- doc/automake.texi | 35 ++++++++++++------ tests/disthook-perms.test | 59 ------------------------------ tests/disthook.test | 89 +++++++++++++++++++++++++++++++++++++++++++++ tests/list-of-tests.mk | 2 +- 4 files changed, 113 insertions(+), 72 deletions(-) delete mode 100755 tests/disthook-perms.test create mode 100755 tests/disthook.test diff --git a/doc/automake.texi b/doc/automake.texi index c2c2a21..3bb365b 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -8420,24 +8420,35 @@ nodist_foo_SOURCES = do-not-distribute.c Occasionally it is useful to be able to change the distribution before it is packaged up. If the @code{dist-hook} rule exists, it is run -after the distribution directory is filled, but before the actual tar -(or shar) file is created. One way to use this is for distributing -files in subdirectories for which a new @file{Makefile.am} is overkill: +after the distribution directory is filled, but before the actual +distribution archives are created. One way to use this is for +removing unnecessary files that get recursively included by specifying +a directory in @code{EXTRA_DIST}: @example +EXTRA_DIST = doc dist-hook: - mkdir $(distdir)/random - cp -p $(srcdir)/random/a1 $(srcdir)/random/a2 $(distdir)/random + rm -rf `find $(distdir)/doc -type d -name .svn` @end example -Another way to use this is for removing unnecessary files that get -recursively included by specifying a directory in EXTRA_DIST: - address@hidden -EXTRA_DIST = doc - address@hidden The caveates described here should be documented in 'disthook.test'. address@hidden +Note that the @code{dist-hook} recipe shouldn't assume that the regular +files in the distribution directory are writable; this might not be the +case if one is packaging from a read-only source tree, or when a address@hidden distcheck} is being done. For similar reasons, the recipe +shouldn't assume that the subdirectories put into the distribution +directory as effect of having them listed in @code{EXTRA_DIST} are +writable. So, if the @code{dist-hook} recipe wants to modify the +content of an existing file (or @code{EXTRA_DIST} subdirectory) in the +distribution directory, it should explicitly to make it writable first: + address@hidden +EXTRA_DIST = README doc dist-hook: - rm -rf `find $(distdir)/doc -type d -name .svn` + chmod u+w $(distdir)/README $(distdir)/doc + echo "Distribution date: `date`" >> README + rm -f $(distdir)/doc/HACKING @end example @vindex distdir diff --git a/tests/disthook-perms.test b/tests/disthook-perms.test deleted file mode 100755 index a5f0acb..0000000 --- a/tests/disthook-perms.test +++ /dev/null @@ -1,59 +0,0 @@ -#! /bin/sh -# Copyright (C) 2012 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 2, 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