From unknown Sun Aug 17 09:10:38 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#9773 <9773@debbugs.gnu.org> To: bug#9773 <9773@debbugs.gnu.org> Subject: Status: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Reply-To: bug#9773 <9773@debbugs.gnu.org> Date: Sun, 17 Aug 2025 16:10:38 +0000 retitle 9773 "make install-info" with DESTDIR writes unwanted usr/share/inf= o/dir.gz reassign 9773 automake submitter 9773 Jonathan Nieder severity 9773 normal tag 9773 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 17 02:40:44 2011 Received: (at submit) by debbugs.gnu.org; 17 Oct 2011 06:40:44 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RFgsN-00043Y-OI for submit@debbugs.gnu.org; Mon, 17 Oct 2011 02:40:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RFgsI-00043H-HG for submit@debbugs.gnu.org; Mon, 17 Oct 2011 02:40:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFgrN-0007Xi-R6 for submit@debbugs.gnu.org; Mon, 17 Oct 2011 02:39:43 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:34491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFgrN-0007Xb-PS for submit@debbugs.gnu.org; Mon, 17 Oct 2011 02:39:41 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFgrM-0002Oa-CF for bug-automake@gnu.org; Mon, 17 Oct 2011 02:39:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFgrK-0007WD-Uu for bug-automake@gnu.org; Mon, 17 Oct 2011 02:39:40 -0400 Received: from mail-iy0-f169.google.com ([209.85.210.169]:36736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFgrK-0007Vu-PX for bug-automake@gnu.org; Mon, 17 Oct 2011 02:39:38 -0400 Received: by iagf6 with SMTP id f6so5020064iag.0 for ; Sun, 16 Oct 2011 23:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=uehIYA+VIS3UTWZTGtGwbOJKwVDfyKHI8Oe6qgHFZqE=; b=RrfrXviU2xHWqDCv24nTUl+nhe089sta4Da63b7yIdPQJGfjD1AuoXgkIrihjkiuv1 sI57nGc+0W0VNeArye+f00ybM/IX3uA888Vk/0uFzhOoUtRE1WQNNbEx2ttBEQCcGW2X PuJ/fWVO94O4r1Ryv545r/mDI9UxqLOlDAB7c= Received: by 10.42.197.197 with SMTP id el5mr35519395icb.23.1318833577632; Sun, 16 Oct 2011 23:39:37 -0700 (PDT) Received: from elie.hsd1.il.comcast.net (c-24-1-56-9.hsd1.il.comcast.net. [24.1.56.9]) by mx.google.com with ESMTPS id bu33sm33744223ibb.11.2011.10.16.23.39.36 (version=SSLv3 cipher=OTHER); Sun, 16 Oct 2011 23:39:37 -0700 (PDT) Date: Mon, 17 Oct 2011 01:39:22 -0500 From: Jonathan Nieder To: bug-automake@gnu.org Subject: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Message-ID: <20111017063921.GA11871@elie.hsd1.il.comcast.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21+46 (b01d63af6fea) (2011-07-01) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.9 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.9 (-----) Hi, Santiago Vila writes[1]: > There is some code in /usr/share/automake-1.11/am/texinfos.am which > checks whether install-info is "Debian install-info" or not: [..] > Now, install-info is GNU install-info, and the "if" will be always true, > as the very first line of "install-info --version" says: > > This is not dpkg install-info anymore, but GNU install-info > > which does not contain the string "debian". As a result, packages may > easily ship /usr/share/info/dir.gz files inside the .deb binary package, > exactly as it happened in 2003. "Now" means dpkg 1.15.4 (2009-09-06) and later. dpkg does not want to be in the business of providing its own "install-info" command. Anyway, as far as I can tell, the check in texinfos.am for Debian didn't make much sense in the first place. It affected not only people building Debian packages but anything else a person happened to do on a Debian machine. And as described at [2], packaging systems which could not rely on such a check ended up removing the dir.gz file on their own. A more appropriate replacement for the "if Debian" condition might be "am I installing to a staging area, or directly to the target system?". In other words, how about this patch? Untested for now. --- [1] http://bugs.debian.org/543992 [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=25;bug=543992 ChangeLog | 13 +++++++++++++ lib/am/texinfos.am | 15 +++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a470bd..40d0d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2011-10-17 Jonathan Nieder + + For Debian Bug#543992: + * lib/am/texinfos.am (install-info-am): When deciding whether to + add to an info/dir file, instead of checking for Debian + install-info, check if DESTDIR is nonempty. Debian install-info + --version does not print "debian" nowadays, so the existing test + was never triggering. Without this change, when preparing a + tarball or package in order to install it later, packagers would + have to remove install-info first or remove the dir file + afterward to avoid clobbering /usr/share/info/dir on the target + system. + 2011-10-07 Stefano Lattarini parallel-tests: warn on conditional TEST_EXTENSIONS definition diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index bfde665..3134943 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -208,18 +208,9 @@ install-info-am: $(INFO_DEPS) echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) -## Only run this code if install-info actually exists, and it is not -## the Debian install-info. FIXME: once Debian install-info goes -## away, we can remove this hack. Some versions of Debian install-info -## print their version on stderr (e.g. 1.8.3), other do it in -## on stdout (e.g. 1.10.15). -## -## Do not use -## install-info --version 2>&1 | sed 1q | grep -v -i debian -## as if install-info does not exist, grep -v will be happy, and -## therefore the code will be triggered although install-info is missing. - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ +## We only want to run this code if installing directly to the target system. +## As an approximation, check if DESTDIR is empty. + @if test "x$(DESTDIR)" = x; then list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ for file in $$list; do \ ## Strip directory -- 1.7.7 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 22 15:07:17 2011 Received: (at submit) by debbugs.gnu.org; 22 Oct 2011 19:07:17 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHgub-0005yQ-Cm for submit@debbugs.gnu.org; Sat, 22 Oct 2011 15:07:17 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHgua-0005y3-26 for submit@debbugs.gnu.org; Sat, 22 Oct 2011 15:07:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHgtA-0004fO-BP for submit@debbugs.gnu.org; Sat, 22 Oct 2011 15:05:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:59564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHgtA-0004fK-9r for submit@debbugs.gnu.org; Sat, 22 Oct 2011 15:05:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHgt8-0005yM-13 for bug-automake@gnu.org; Sat, 22 Oct 2011 15:05:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHgt6-0004fA-4r for bug-automake@gnu.org; Sat, 22 Oct 2011 15:05:45 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:44314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHgt5-0004f4-VT for bug-automake@gnu.org; Sat, 22 Oct 2011 15:05:44 -0400 Received: by wwf27 with SMTP id 27so1580952wwf.30 for ; Sat, 22 Oct 2011 12:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; bh=LABXPwVdmE0NU4S2ppxnHc4m/wUGGoKtesNMhIn7Yes=; b=e0xA/ca4hC/ddZCWqsAye8+SgNb4ctyrHaAHsUGIfcE6Cq4ejAF4dkef+8OmRiLEpX O0UJwNBsfENS1x4J0nkh8tYX4Ae9i04a/R+cRPUlYK8MrtH8GcTAntHDpGtrZHcCX2nN 9H+oVYpEqMy7Q4MQKWSj+b1tLw2mFJ09p4pB0= Received: by 10.216.9.204 with SMTP id 54mr1140728wet.1.1319310341941; Sat, 22 Oct 2011 12:05:41 -0700 (PDT) Received: from bigio.localnet (host157-90-dynamic.14-87-r.retail.telecomitalia.it. [87.14.90.157]) by mx.google.com with ESMTPS id o17sm27177466wbm.6.2011.10.22.12.05.39 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 22 Oct 2011 12:05:40 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Re: bug#9773: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Date: Sat, 22 Oct 2011 21:05:30 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <20111017063921.GA11871@elie.hsd1.il.comcast.net> In-Reply-To: <20111017063921.GA11871@elie.hsd1.il.comcast.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201110222105.30998.stefano.lattarini@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -4.8 (----) X-Debbugs-Envelope-To: submit Cc: Jonathan Nieder , 9773@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.9 (----) On Monday 17 October 2011, Jonathan Nieder wrote: > Hi, > Hi Jonathan, sorry for the delay. > [SNIP] > > In other words, how about this patch? Untested for now. > --- > [1] http://bugs.debian.org/543992 > [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=25;bug=543992 > > ChangeLog | 13 +++++++++++++ > lib/am/texinfos.am | 15 +++------------ > 2 files changed, 16 insertions(+), 12 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index 4a470bd..40d0d5d 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,16 @@ > +2011-10-17 Jonathan Nieder > + > + For Debian Bug#543992: > + * lib/am/texinfos.am (install-info-am): When deciding whether to > + add to an info/dir file, instead of checking for Debian > + install-info, check if DESTDIR is nonempty. Debian install-info > + --version does not print "debian" nowadays, so the existing test > + was never triggering. Without this change, when preparing a > + tarball or package in order to install it later, packagers would > + have to remove install-info first or remove the dir file > + afterward to avoid clobbering /usr/share/info/dir on the target > + system. > + I must say that I don't like this very much. A better fix IMHO would be to have an environment variable to inhibit the creation/updating of the `${infodir}/dir' file, rather than trying to guess the user's intentions by looking at $(DESTDIR) behind his back. But I don't know exactly how the creation of debian packages work, so I can't tell whether my proposed solution would satisfy the packagers or not. Opinions? Objections? Thanks, Stefano From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 23 02:28:52 2011 Received: (at 9773) by debbugs.gnu.org; 23 Oct 2011 06:28:52 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHrYB-0004Z1-3A for submit@debbugs.gnu.org; Sun, 23 Oct 2011 02:28:52 -0400 Received: from mail-pz0-f50.google.com ([209.85.210.50]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHrY8-0004Yo-SD for 9773@debbugs.gnu.org; Sun, 23 Oct 2011 02:28:50 -0400 Received: by pzk34 with SMTP id 34so13866338pzk.9 for <9773@debbugs.gnu.org>; Sat, 22 Oct 2011 23:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=WMj67qYGxOy8ykuyp6P6dk7MLhBYo8HGSjN1iIT4I9Q=; b=NSxdY1LF0eWwEoJKIwb+iwi6LwPb3rpsRL3zGq8p+SiDu/cann1vcuB40tVwz7zeuc 7HZTnx+u9Il1FX/eyo92EhLB1/3n0wcWzpwBOWOwVXaWQlgk4PWVjHrSyBK7EyZw6qo6 lgtH0DlQslg7t+lIu8vFktRH/eAb7aJ6CUx/0= Received: by 10.68.29.101 with SMTP id j5mr38981957pbh.61.1319351238516; Sat, 22 Oct 2011 23:27:18 -0700 (PDT) Received: from elie.sunraytvi.com ([209.118.182.66]) by mx.google.com with ESMTPS id ml4sm51509899pbc.0.2011.10.22.23.27.16 (version=SSLv3 cipher=OTHER); Sat, 22 Oct 2011 23:27:17 -0700 (PDT) Date: Sun, 23 Oct 2011 01:27:14 -0500 From: Jonathan Nieder To: Stefano Lattarini Subject: Re: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Message-ID: <20111023062714.GB2884@elie.sunraytvi.com> References: <20111017063921.GA11871@elie.hsd1.il.comcast.net> <201110222105.30998.stefano.lattarini@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110222105.30998.stefano.lattarini@gmail.com> User-Agent: Mutt/1.5.21+46 (b01d63af6fea) (2011-07-01) X-Spam-Score: -3.6 (---) X-Debbugs-Envelope-To: 9773 Cc: 9773@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.6 (---) Stefano Lattarini wrote: > On Monday 17 October 2011, Jonathan Nieder wrote: >> +++ b/ChangeLog >> @@ -1,3 +1,16 @@ >> +2011-10-17 Jonathan Nieder >> + >> + For Debian Bug#543992: >> + * lib/am/texinfos.am (install-info-am): When deciding whether to >> + add to an info/dir file, instead of checking for Debian >> + install-info, check if DESTDIR is nonempty. [...] > I must say that I don't like this very much. A better fix IMHO would > be to have an environment variable to inhibit the creation/updating of > the `${infodir}/dir' file Yes, that sounds sensible. It would be better than checking for Debian install-info (because that was insane) and better than the current state (because it gives packagers on all distros an easy way to request inhibiting creation of the ${infodir}/dir file). Keying behavior on $(DESTDIR) left an unpleasant taste in my mouth, too. Thanks for your thoughtfulness. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 23 07:28:16 2011 Received: (at submit) by debbugs.gnu.org; 23 Oct 2011 11:28:16 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHwDv-0002yy-RC for submit@debbugs.gnu.org; Sun, 23 Oct 2011 07:28:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHwDq-0002yY-0P for submit@debbugs.gnu.org; Sun, 23 Oct 2011 07:28:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHwCL-0004zs-B6 for submit@debbugs.gnu.org; Sun, 23 Oct 2011 07:26:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:50175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHwCL-0004zm-9O for submit@debbugs.gnu.org; Sun, 23 Oct 2011 07:26:37 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHwCJ-0006gX-Eh for bug-automake@gnu.org; Sun, 23 Oct 2011 07:26:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHwCG-0004z9-PF for bug-automake@gnu.org; Sun, 23 Oct 2011 07:26:35 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:49130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHwCG-0004z2-C2; Sun, 23 Oct 2011 07:26:32 -0400 Received: by wwf27 with SMTP id 27so1942591wwf.30 for ; Sun, 23 Oct 2011 04:26:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:message-id:content-type; bh=IXRRBKXtd6nvWzxXXE0s9lf+6N7+kQ9hNYyqQNAUBY8=; b=KxIikPFeuMhJtzhm/Pn4DkdFr28iX+ocRk+mJTBuYYKFeX2KRZmLjDsJRjEkjsyC0i QgWxWi35qeUI+ZMebd6QDRmHvuJkzttXu012lKt8NKn5a4vd/cNpp1UDe/vnxfw4zLuH BtS0zVsSadSQkPZsDL02R2KYGR7oUbZ2qHfyc= Received: by 10.216.4.207 with SMTP id 57mr2446464wej.110.1319369191094; Sun, 23 Oct 2011 04:26:31 -0700 (PDT) Received: from bigio.localnet (host83-30-dynamic.60-82-r.retail.telecomitalia.it. [82.60.30.83]) by mx.google.com with ESMTPS id e7sm32598773wbh.12.2011.10.23.04.26.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Oct 2011 04:26:30 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Re: bug#9773: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Date: Sun, 23 Oct 2011 13:26:18 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <20111017063921.GA11871@elie.hsd1.il.comcast.net> <201110222105.30998.stefano.lattarini@gmail.com> <20111023062714.GB2884@elie.sunraytvi.com> In-Reply-To: <20111023062714.GB2884@elie.sunraytvi.com> MIME-Version: 1.0 Message-Id: <201110231326.19991.stefano.lattarini@gmail.com> Content-Type: Multipart/Mixed; boundary="Boundary-00=_bn/oOyaz4cLA50q" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: submit Cc: Jonathan Nieder , 9773@debbugs.gnu.org, automake-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) --Boundary-00=_bn/oOyaz4cLA50q Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Sunday 23 October 2011, Jonathan Nieder wrote: > Stefano Lattarini wrote: > > On Monday 17 October 2011, Jonathan Nieder wrote: > > >> +++ b/ChangeLog > >> @@ -1,3 +1,16 @@ > >> +2011-10-17 Jonathan Nieder > >> + > >> + For Debian Bug#543992: > >> + * lib/am/texinfos.am (install-info-am): When deciding whether to > >> + add to an info/dir file, instead of checking for Debian > >> + install-info, check if DESTDIR is nonempty. > [...] > > I must say that I don't like this very much. A better fix IMHO would > > be to have an environment variable to inhibit the creation/updating of > > the `${infodir}/dir' file > > Yes, that sounds sensible. It would be better than checking for > Debian install-info (because that was insane) and better than the > current state (because it gives packagers on all distros an easy way > to request inhibiting creation of the ${infodir}/dir file). > > Keying behavior on $(DESTDIR) left an unpleasant taste in my mouth, > too. Thanks for your thoughtfulness. > Glad we agree :-) Here is my proposed patch (for maint). I will push in 72 hours if there is no objection or review by then. Thanks, Stefano --Boundary-00=_bn/oOyaz4cLA50q Content-Type: text/x-patch; charset="utf-8"; name="0001-info-allow-user-to-inhibit-creation-update-of-infodi.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="0001-info-allow-user-to-inhibit-creation-update-of-infodi.patch" =46rom 8b0bb8bbda8ac1e859c577cba1549ffbc0ae4d52 Mon Sep 17 00:00:00 2001 Message-Id: <8b0bb8bbda8ac1e859c577cba1549ffbc0ae4d52.1319369157.git.stefan= o.lattarini@gmail.com> =46rom: Stefano Lattarini Date: Sun, 23 Oct 2011 13:19:21 +0200 Subject: [PATCH] info: allow user to inhibit creation/update of '${infodir}= /dir' With this change, we allow the user to request the install-info rules not to update the `${infodir}/dir' file, by exporting the environment variable `AM_UPDATE_INFO_DIR' to the value "no". This is especially useful to distro packagers, and is a definite improvement over our previous hack of looking whether the `install-info' program was the Debian or GNU version -- hack which had been silently broken with recent versions of debian install-info BTW (probably since dpkg 1.15.4, 2009-09-06). This change fixes automake bug#9773. See also Debian Bug#543992. * lib/am/texinfos.am: Don't look anymore at the output of `install-info --version' to decide whether to use it to update the `${infodir}/dir' or not; instead, honour the environment variable `AM_UPDATE_INFO_DIR'. * tests/install-info-dir.test: New test. * tests/Makefile.am (TESTS): Add it. * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted interferences from the environment. * doc/automake.texi (Texinfo): Update. * NEWS: Likewise. * THANKS: Likewise. Report by Jonathan Nieder. =2D-- ChangeLog | 25 ++++++++ NEWS | 8 +++ THANKS | 1 + doc/automake.texi | 7 ++ lib/am/texinfos.am | 22 +++---- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/install-info-dir.test | 142 +++++++++++++++++++++++++++++++++++++++= ++++ 8 files changed, 195 insertions(+), 12 deletions(-) create mode 100755 tests/install-info-dir.test diff --git a/ChangeLog b/ChangeLog index 0836c77..44d77f8 100644 =2D-- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2011-10-23 Stefano Lattarini + + info: allow user to inhibit creation/update of '${infodir}/dir' + With this change, we allow the user to request the install-info + rules not to update the `${infodir}/dir' file, by exporting the + environment variable `AM_UPDATE_INFO_DIR' to the value "no". + This is especially useful to distro packagers, and is a definite + improvement over our previous hack of looking whether the + `install-info' program was the Debian or GNU version -- hack + which had been silently broken with recent versions of debian + install-info BTW (probably since dpkg 1.15.4, 2009-09-06). + This change fixes automake bug#9773. See also Debian Bug#543992. + * lib/am/texinfos.am: Don't look anymore at the output of + `install-info --version' to decide whether to use it to update + the `${infodir}/dir' or not; instead, honour the environment + variable `AM_UPDATE_INFO_DIR'. + * tests/install-info-dir.test: New test. + * tests/Makefile.am (TESTS): Add it. + * tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted + interferences from the environment. + * doc/automake.texi (Texinfo): Update. + * NEWS: Likewise. + * THANKS: Likewise. + Report by Jonathan Nieder. + 2011-10-19 Stefano Lattarini =20 dejagnu: allow the package developer to extend site.exp diff --git a/NEWS b/NEWS index 92c7735..fe1dc97 100644 =2D-- a/NEWS +++ b/NEWS @@ -44,6 +44,10 @@ New in 1.11.0a: file generated by automake-provided rules by defining the special make variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'. =20 + - The `install-info' rule can now be instructed not to create/update + the `${infodir}/dir' file, by exporting the new environment variable + `AM_UPDATE_INFO_DIR' to the value "no". + Bugs fixed in 1.11.0a: =20 * Bugs introduced by 1.11: @@ -127,6 +131,10 @@ Bugs fixed in 1.11.0a: - Now aclocal and automake, when they've to spawn autoconf or autom4te processes, honour the configure-time definitions of AUTOCONF and AUTOM4TE. + + - The `install-info' recipe does not try anymore to guess whether the + `install-info' program is from Debian or from GNU, and adaptively + change its behaviour; this has proven to be frail and easy to regress. =0C New in 1.11: =20 diff --git a/THANKS b/THANKS index eae683f..7fa37c2 100644 =2D-- a/THANKS +++ b/THANKS @@ -171,6 +171,7 @@ John Pierce hawkfan@pyrotechnics.com John Ratliff autoconf@technoplaza.net John R. Cary cary@txcorp.com John W. Coomes jcoomes@eng.Sun.COM +Jonathan Nieder jrnieder@gmail.com Josh MacDonald jmacd@cs.berkeley.edu Joshua Cowan jcowan@jcowan.reslife.okstate.edu js pendry js.pendry@msdw.com diff --git a/doc/automake.texi b/doc/automake.texi index eac380a..f6039bb 100644 =2D-- a/doc/automake.texi +++ b/doc/automake.texi @@ -7963,6 +7963,13 @@ be prevented via the @code{no-installinfo} option. = In this case, @file{.info} files are not installed by default, and user must request this explicitly using @samp{make install-info}. =20 +@vindex AM_UPDATE_INFO_DIR +By default, @code{make install-info} will try to run the +@command{install-info} program (if available) to update (or create) +the @file{@code{$@{infodir@}}/dir} index. If this is undesired, it +can be prevented by exporting the @code{AM_UPDATE_INFO_DIR} variable +to "@code{no}". + The following variables are used by the Texinfo build rules. =20 @vtable @code diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index c9dcd9d..0279bf3 100644 =2D-- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -208,18 +208,16 @@ install-info-am: $(INFO_DEPS) echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) =2D## Only run this code if install-info actually exists, and it is not =2D## the Debian install-info. FIXME: once Debian install-info goes =2D## away, we can remove this hack. Some versions of Debian install-info =2D## print their version on stderr (e.g. 1.8.3), other do it in =2D## on stdout (e.g. 1.10.15). =2D## =2D## Do not use =2D## install-info --version 2>&1 | sed 1q | grep -v -i debian =2D## as if install-info does not exist, grep -v will be happy, and =2D## therefore the code will be triggered although install-info is missing. =2D @if (install-info --version && \ =2D install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/nu= ll 2>&1; then \ +## Only run this code if install-info actually exists, and if the user +## don't request it not to be run (through the `AM_UPDATE_INFO_DIR' +## environment variable). See automake bug#9773 and Debian Bug#543992. + @am__run_installinfo=3Dyes; \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) am__run_installinfo=3Dno;; \ + *) (install-info --version) >/dev/null 2>&1 \ + || am__run_installinfo=3Dno;; \ + esac; \ + if test $$am__run_installinfo =3D yes; then \ list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ for file in $$list; do \ ## Strip directory diff --git a/tests/Makefile.am b/tests/Makefile.am index efb4fea..54519b2 100644 =2D-- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -437,6 +437,7 @@ init2.test \ insh2.test \ install2.test \ installdir.test \ +install-info-dir.test \ instsh.test \ instsh2.test \ instsh3.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index f12b81d..ea7c724 100644 =2D-- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -721,6 +721,7 @@ init2.test \ insh2.test \ install2.test \ installdir.test \ +install-info-dir.test \ instsh.test \ instsh2.test \ instsh3.test \ diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test new file mode 100755 index 0000000..b10a5ad =2D-- /dev/null +++ b/tests/install-info-dir.test @@ -0,0 +1,142 @@ +#! /bin/sh +# 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 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 . + +# Checks on the `install-info' target. +# Details about the individual checks' purposes and motivations are +# inlined, below. + +# FIXME: this test is a good candidate for a conversion top TAP. +# FIXME: and could be merged with txinfo27.test + +required=3Dmakeinfo +. ./defs || Exit 1 + +cwd=3D`pwd` || fatal_ "cannot get current working directory" + +mkdir bin +saved_PATH=3D$PATH; export saved_PATH +PATH=3D$cwd/bin$PATH_SEPARATOR$PATH; export PATH + +set -e + +cat >> configure.in <<'END' +AC_OUTPUT +END + +cat > Makefile.am << 'END' +info_TEXINFOS =3D foo.texi +END + +cat > foo.texi << 'END' +\input texinfo +@setfilename foo.info +@node Top +Hello world! +@bye +END + +: > texinfo.tex + +$ACLOCAL +$AUTOMAKE +$AUTOCONF + +instdir=3D_inst +destdir=3D_dest + +./configure --prefix=3D"$cwd/$instdir" --infodir=3D"$cwd/$instdir/info" + +$MAKE info +test -f foo.info + +if install-info --version; then + have_installinfo=3Dyes +else + have_installinfo=3Dno +fi + +# The `install-info' target updates the `${infodir}/dir' file +# by default (if the `install-info' program is available). +# This should happen in a normal as well as in a DESTDIR installation. +if test $have_installinfo =3D yes; then + $MAKE install-info + test -f $instdir/info/foo.info + test -f $instdir/info/dir + $MAKE DESTDIR=3D"$cwd/$destdir" install-info + test -f "$destdir/$cwd/$instdir"/info/foo.info + test -f "$destdir/$cwd/$instdir"/info/dir +fi + +rm -rf $instdir $destdir + +# The `install-info' target doesn't fail if the `install-info' +# program is not available. +cat > bin/install-info <<'END' +#!/bin/sh +echo error from install-info >&2 +exit 127 +END +chmod a+x bin/install-info +$MAKE install-info >output 2>&1 || { cat output; Exit 1; } +cat output +test -f $instdir/info/foo.info +test ! -f $instdir/info/dir +grep 'error from install-info' output && Exit 1 + +rm -rf $instdir output + +if test $have_installinfo =3D yes; then + # The `install-info' target doesn't try to guess whether the `install-in= fo' + # is the GNU or debian version. + unindent > bin/install-info <<'END' + #!/bin/sh + set -e; set -u; + for fd in 1 2; do + for str in dpkg debian Debian; do + eval "echo This is $str install-info >&$fd" + done + done + PATH=3D$saved_PATH; export PATH + exec install-info ${1+"$@"} +END + $MAKE install-info + test -f $instdir/info/foo.info + test -f $instdir/info/dir +fi + +rm -rf $instdir bin/install-info + +# The `AM_UPDATE_INFO_DIR' environment variable can be used to +# prevent the creation or update of the `${infodir}/dir' file, +# if set to a "no" value. +for val in no NO n; do + rm -rf $instdir + env AM_UPDATE_INFO_DIR=3D"$val" $MAKE install-info + test -f $instdir/info/foo.info + test ! -f $instdir/info/dir +done +if test $have_installinfo =3D yes; then + for val in 'yes' 'who cares!'; do + rm -rf $instdir + env AM_UPDATE_INFO_DIR=3D"$val" $MAKE install-info + test -f $instdir/info/foo.info + test -f $instdir/info/dir + done +fi + +rm -rf $instdir + +: =2D-=20 1.7.2.3 --Boundary-00=_bn/oOyaz4cLA50q-- From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 23 11:13:49 2011 Received: (at 9773) by debbugs.gnu.org; 23 Oct 2011 15:13:49 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHzkC-0000Lo-Jq for submit@debbugs.gnu.org; Sun, 23 Oct 2011 11:13:49 -0400 Received: from mail-gy0-f172.google.com ([209.85.160.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RHzk9-0000La-K4 for 9773@debbugs.gnu.org; Sun, 23 Oct 2011 11:13:46 -0400 Received: by gyh20 with SMTP id 20so4943580gyh.3 for <9773@debbugs.gnu.org>; Sun, 23 Oct 2011 08:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=1uxz+O5duQdRgSbz/9plszZmvKSQrzjZLcmWrHCGDo4=; b=i51vHxIqdvcLbu8r8hQitrisxzRVq6e3eHjLQEScoJAMh1KKyjiiGWU+GWwGJTwqre 986j7l4bv61pzIyJwaL6YsAkuthSyxnbc/RcwsUFrrh+0ovhgL13cUYraB4iDCkI8DFo orLS/XYK/Kk86rSCd6RsuL0cEujXBZ1RVNRoU= Received: by 10.68.9.69 with SMTP id x5mr880357pba.118.1319382733011; Sun, 23 Oct 2011 08:12:13 -0700 (PDT) Received: from elie.domain.sunraytvi.com (67.111.52.130.ptr.us.xo.net. [67.111.52.130]) by mx.google.com with ESMTPS id ml4sm56322632pbc.0.2011.10.23.08.12.11 (version=SSLv3 cipher=OTHER); Sun, 23 Oct 2011 08:12:11 -0700 (PDT) Date: Sun, 23 Oct 2011 10:12:00 -0500 From: Jonathan Nieder To: Stefano Lattarini Subject: Re: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Message-ID: <20111023151146.GA15458@elie.domain.sunraytvi.com> References: <20111017063921.GA11871@elie.hsd1.il.comcast.net> <201110222105.30998.stefano.lattarini@gmail.com> <20111023062714.GB2884@elie.sunraytvi.com> <201110231326.19991.stefano.lattarini@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110231326.19991.stefano.lattarini@gmail.com> User-Agent: Mutt/1.5.21+46 (b01d63af6fea) (2011-07-01) X-Spam-Score: -3.6 (---) X-Debbugs-Envelope-To: 9773 Cc: 9773@debbugs.gnu.org, automake-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.6 (---) Stefano Lattarini wrote: > Here is my proposed patch (for maint). Thanks! Two nits: [...] > --- a/lib/am/texinfos.am > +++ b/lib/am/texinfos.am > @@ -208,18 +208,16 @@ install-info-am: $(INFO_DEPS) > echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ > $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done > @$(POST_INSTALL) [...] > +## Only run this code if install-info actually exists, and if the user > +## don't request it not to be run (through the `AM_UPDATE_INFO_DIR' > +## environment variable). See automake bug#9773 and Debian Bug#543992. "don't request" -> "doesn't request" [...] > --- /dev/null > +++ b/tests/install-info-dir.test > @@ -0,0 +1,142 @@ [...] > +# FIXME: this test is a good candidate for a conversion top TAP. > +# FIXME: and could be merged with txinfo27.test "top TAP" -> "to TAP" The patch itself looks sensible, though I haven't tested it or anything. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 23 13:11:56 2011 Received: (at submit) by debbugs.gnu.org; 23 Oct 2011 17:11:57 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RI1aW-00033r-MF for submit@debbugs.gnu.org; Sun, 23 Oct 2011 13:11:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RI1aU-00033a-Kl for submit@debbugs.gnu.org; Sun, 23 Oct 2011 13:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RI1Yz-0003Fi-TW for submit@debbugs.gnu.org; Sun, 23 Oct 2011 13:10:22 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:49705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RI1Yz-0003FZ-Rj for submit@debbugs.gnu.org; Sun, 23 Oct 2011 13:10:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RI1Yw-0000nY-2U for bug-automake@gnu.org; Sun, 23 Oct 2011 13:10:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RI1Yu-0003Es-Ln for bug-automake@gnu.org; Sun, 23 Oct 2011 13:10:18 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:58493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RI1Yu-0003Em-Cn; Sun, 23 Oct 2011 13:10:16 -0400 Received: by wwf27 with SMTP id 27so2113083wwf.30 for ; Sun, 23 Oct 2011 10:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; bh=ycJ2sn2nSSH3TKXhMcmCYzsthHPRG8IkyG9ouod8rPs=; b=p/pwaVC+IdgRY/oZv1zI3igpM7xZMgp00OqaSq56KZJJDgv4LgQJgJu51ADfKy3ZHn OuI3TtUQDUG4WW1ep51KpCXYRo/1y26i+iNhusHw4RgKSv72H+18BxGjqH+4pMLkXTud wfX+50CRU8PmiucaHMLf90m9EtfjTVlr/1N+g= Received: by 10.216.229.163 with SMTP id h35mr2058237weq.53.1319389814481; Sun, 23 Oct 2011 10:10:14 -0700 (PDT) Received: from bigio.localnet (host124-95-dynamic.0-87-r.retail.telecomitalia.it. [87.0.95.124]) by mx.google.com with ESMTPS id gg13sm636732wbb.8.2011.10.23.10.10.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Oct 2011 10:10:12 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Re: bug#9773: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Date: Sun, 23 Oct 2011 19:09:59 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <20111017063921.GA11871@elie.hsd1.il.comcast.net> <201110231326.19991.stefano.lattarini@gmail.com> <20111023151146.GA15458@elie.domain.sunraytvi.com> In-Reply-To: <20111023151146.GA15458@elie.domain.sunraytvi.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201110231910.00061.stefano.lattarini@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit Cc: Jonathan Nieder , 9773@debbugs.gnu.org, automake-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.0 (-----) On Sunday 23 October 2011, Jonathan Nieder wrote: > Stefano Lattarini wrote: > > > Here is my proposed patch (for maint). > > Thanks! Two nits: > Thanks for the quick review, consider those nits fixed. Also, I've seen that the test script I've added was creating a dummy `texinfo.tex' file, instead of allowing "automake -a" to install a real one (this was a leftover of a previous version of the patch); I've fixed that too. Here is what I've squashed in: diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 0279bf3..80712cf 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -209,7 +209,7 @@ install-info-am: $(INFO_DEPS) $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) ## Only run this code if install-info actually exists, and if the user -## don't request it not to be run (through the `AM_UPDATE_INFO_DIR' +## doesn't request it not to be run (through the `AM_UPDATE_INFO_DIR' ## environment variable). See automake bug#9773 and Debian Bug#543992. @am__run_installinfo=yes; \ case $$AM_UPDATE_INFO_DIR in \ diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test index b10a5ad..f75b115 100755 --- a/tests/install-info-dir.test +++ b/tests/install-info-dir.test @@ -18,8 +18,8 @@ # Details about the individual checks' purposes and motivations are # inlined, below. -# FIXME: this test is a good candidate for a conversion top TAP. -# FIXME: and could be merged with txinfo27.test +# FIXME: this test is a good candidate for a conversion to TAP, +# FIXME: and could be merged with `txinfo27.test'. required=makeinfo . ./defs || Exit 1 @@ -48,10 +48,8 @@ Hello world! @bye END -: > texinfo.tex - $ACLOCAL -$AUTOMAKE +$AUTOMAKE -a $AUTOCONF instdir=_inst From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 29 06:34:26 2011 Received: (at submit) by debbugs.gnu.org; 29 Oct 2011 10:34:26 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RK6F8-000159-ET for submit@debbugs.gnu.org; Sat, 29 Oct 2011 06:34:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RK6F5-00014q-7F for submit@debbugs.gnu.org; Sat, 29 Oct 2011 06:34:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RK6D8-0004mx-Sm for submit@debbugs.gnu.org; Sat, 29 Oct 2011 06:32:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:39189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK6D8-0004mo-RC for submit@debbugs.gnu.org; Sat, 29 Oct 2011 06:32:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK6D7-0000nI-Vk for bug-automake@gnu.org; Sat, 29 Oct 2011 06:32:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RK6D6-0004me-Q0 for bug-automake@gnu.org; Sat, 29 Oct 2011 06:32:21 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:44872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RK6D6-0004ma-HS; Sat, 29 Oct 2011 06:32:20 -0400 Received: by wyg34 with SMTP id 34so5620753wyg.0 for ; Sat, 29 Oct 2011 03:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:message-id:content-type:content-transfer-encoding; bh=cVoh9yBvcRk67dIRxrN7Jm+Y3IzrXRD9inZPCI6qYec=; b=KKqjNOR4xCRJY/7dxQjIeLPefDHszmBpYpYSjc2Q8tGU4nAakTtEc86vfqOmbqF8IC +wztTOGDwZzn0nJdC9+c2novMLXOLGlu3CyIsLsuOJm1VJiDW5E23OoVqK0OndgX6jiE 0uTGfopjjDCD1Oiy7vejBGBcbc0rvNEshP1ow= Received: by 10.227.206.147 with SMTP id fu19mr8374107wbb.22.1319884339660; Sat, 29 Oct 2011 03:32:19 -0700 (PDT) Received: from bigio.localnet (host250-103-dynamic.0-87-r.retail.telecomitalia.it. [87.0.103.250]) by mx.google.com with ESMTPS id ff6sm20484014wbb.10.2011.10.29.03.32.17 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 29 Oct 2011 03:32:18 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Re: bug#9773: "make install-info" with DESTDIR writes unwanted usr/share/info/dir.gz Date: Sat, 29 Oct 2011 12:32:04 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <20111017063921.GA11871@elie.hsd1.il.comcast.net> <20111023062714.GB2884@elie.sunraytvi.com> <201110231326.19991.stefano.lattarini@gmail.com> In-Reply-To: <201110231326.19991.stefano.lattarini@gmail.com> MIME-Version: 1.0 Message-Id: <201110291232.05115.stefano.lattarini@gmail.com> Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit Cc: Jonathan Nieder , 9773@debbugs.gnu.org, automake-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) tags 9773 patch close 9773 thanks On Sunday 23 October 2011, Stefano Lattarini wrote: > Here is my proposed patch (for maint). I will push in 72 hours > if there is no objection or review by then. > I've pushed the patch to maint now (after addressing the nits pointed out by Jonathan). I'm thus closing this report. Regards, Stefano From unknown Sun Aug 17 09:10:38 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 26 Nov 2011 12:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator