From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.comp.lib.gnulib.bugs,gmane.emacs.devel Subject: Re: Proposed gnulib renames Date: Thu, 27 Jan 2011 16:32:08 -0800 Organization: UCLA Computer Science Department Message-ID: <4D420E88.10806@cs.ucla.edu> References: <83y66bzuhc.fsf@gnu.org> <4D4120B9.60604@cs.ucla.edu> <201101271114.54884.bruno@clisp.org> <201101271123.32988.bruno@clisp.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1296203632 29419 80.91.229.12 (28 Jan 2011 08:33:52 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 28 Jan 2011 08:33:52 +0000 (UTC) Cc: bug-gnulib@gnu.org, cyd@stupidchicken.com, emacs-devel@gnu.org, monnier@iro.umontreal.ca, Eli Zaretskii , Eric Blake To: Bruno Haible Original-X-From: bug-gnulib-bounces+gnu-bug-gnulib=m.gmane.org@gnu.org Fri Jan 28 09:33:47 2011 Return-path: Envelope-to: gnu-bug-gnulib@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pijm4-0004Yx-NF for gnu-bug-gnulib@m.gmane.org; Fri, 28 Jan 2011 09:33:44 +0100 Original-Received: from localhost ([127.0.0.1]:44890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PijkP-00037k-IY for gnu-bug-gnulib@m.gmane.org; Fri, 28 Jan 2011 03:32:01 -0500 Original-Received: from [140.186.70.92] (port=54453 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiivU-00063j-Ee for bug-gnulib@gnu.org; Fri, 28 Jan 2011 02:39:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiivS-0004Np-NV for bug-gnulib@gnu.org; Fri, 28 Jan 2011 02:39:24 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:33858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiivS-0004Nd-Au; Fri, 28 Jan 2011 02:39:22 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 7F60839E80F0; Thu, 27 Jan 2011 16:32:10 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id acQIHQq4Okuj; Thu, 27 Jan 2011 16:32:09 -0800 (PST) Original-Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 0656E39E80DC; Thu, 27 Jan 2011 16:32:09 -0800 (PST) User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 In-Reply-To: <201101271123.32988.bruno@clisp.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 131.179.128.62 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnulib-bounces+gnu-bug-gnulib=m.gmane.org@gnu.org Errors-To: bug-gnulib-bounces+gnu-bug-gnulib=m.gmane.org@gnu.org Xref: news.gmane.org gmane.comp.lib.gnulib.bugs:25055 gmane.emacs.devel:135125 Archived-At: On 01/27/11 02:23, Bruno Haible wrote: > The file that needs to be kept so > that old files don't accumulate as garbage is gnulib-comp.m4. Thanks, I installed this into the Emacs trunk. I was leery about using 'mv' as the first step, because what if 'make' is interrupted right after the 'mv'? gl-comp.m4 will be missing and a later 'make' will fail because aclocal.m4 can't be built. So I instead used 'cp', as follows. === modified file 'ChangeLog' --- ChangeLog 2011-01-27 07:24:57 +0000 +++ ChangeLog 2011-01-28 00:25:24 +0000 @@ -1,3 +1,12 @@ +2011-01-28 Paul Eggert + + improve fix for MS-DOS file name clash + * Makefile.in (DOS_gnulib_comp.m4): Renamed from DOS-gnulib-comp.m4, + for portability to POSIX make. Reported by Bruno Haible. + (sync-from-gnulib): Copy gl-comp.m4 (if present) back to + gnulib-comp.m4 before running gnulib-tool, to prevent old gnulib + files from accumulating as garbage. Also reported by Bruno Haible. + 2011-01-27 Paul Eggert fix two m4/gnulib-*.m4 file names that clashed under MS-DOS === modified file 'Makefile.in' --- Makefile.in 2011-01-27 07:24:57 +0000 +++ Makefile.in 2011-01-28 00:25:24 +0000 @@ -325,7 +325,7 @@ git clone git://git.savannah.gnu.org/gnulib.git $@ # A shorter name that satisfies MS-DOS 8+3 constraints. -DOS-gnulib-comp.m4 = gl-comp.m4 +DOS_gnulib_comp.m4 = gl-comp.m4 # Update modules from gnulib, for maintainers, who should have it in # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools @@ -334,10 +334,11 @@ GNULIB_TOOL_FLAGS = \ --import --no-changelog --no-vc-files --makefile-name=gnulib.mk sync-from-gnulib: $(gnulib_srcdir) + -cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4 cd $(srcdir) && \ $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES) cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4 - cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS-gnulib-comp.m4) + cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4) cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc cp \ $(gnulib_srcdir)/build-aux/config.sub \ @@ -410,7 +411,7 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf -ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS-gnulib-comp.m4) +ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4) $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && aclocal -I m4