From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lute Kamstra Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] make-dist fixes and clean-ups Date: Mon, 09 May 2005 14:19:14 +0200 Message-ID: <87wtq84mnx.fsf@xs4all.nl> References: <87vf64bk4u.fsf@marant.org> <87d5sbcfqi.fsf@xs4all.nl> <87y8az2l7i.fsf@marant.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1115642105 28434 80.91.229.2 (9 May 2005 12:35:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 9 May 2005 12:35:05 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 09 14:34:55 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DV7SL-0008QO-8V for ged-emacs-devel@m.gmane.org; Mon, 09 May 2005 14:33:53 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DV7af-000341-Fw for ged-emacs-devel@m.gmane.org; Mon, 09 May 2005 08:42:29 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DV7Vf-00015a-Hx for emacs-devel@gnu.org; Mon, 09 May 2005 08:37:19 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DV7Vd-00014I-PQ for emacs-devel@gnu.org; Mon, 09 May 2005 08:37:18 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DV7Vc-0000k6-SC for emacs-devel@gnu.org; Mon, 09 May 2005 08:37:17 -0400 Original-Received: from [194.109.24.35] (helo=smtp-vbr15.xs4all.nl) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DV7KF-0007Lu-MA for emacs-devel@gnu.org; Mon, 09 May 2005 08:25:31 -0400 Original-Received: from pijl (a80-127-67-124.adsl.xs4all.nl [80.127.67.124]) by smtp-vbr15.xs4all.nl (8.12.11/8.12.11) with ESMTP id j49CJFh1008311; Mon, 9 May 2005 14:19:15 +0200 (CEST) (envelope-from Lute.Kamstra@xs4all.nl) Original-Received: from lute by pijl with local (Exim 3.36 #1 (Debian)) id 1DV7EA-0005LG-00; Mon, 09 May 2005 14:19:14 +0200 Original-To: =?iso-8859-1?Q?J=E9r=F4me?= Marant In-Reply-To: <87y8az2l7i.fsf@marant.org> (=?iso-8859-1?Q?J=E9r=F4me?= Marant's message of "Sun, 01 May 2005 14:18:41 +0200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) Original-Lines: 58 X-Virus-Scanned: by XS4ALL Virus Scanner X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:36907 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:36907 J=E9r=F4me Marant writes: > Lute Kamstra writes: > >> J=E9r=F4me Marant writes: >> >>> + Do not remove ldefs-boot.el. >> >> Why? make-dist distributes loaddefs.el, so there's no need to >> distribute ldefs-boot.el. > > I need to make make-dist work on an non-bootstrapped tree. We, at Debian, > don't include .elc files in the tarball and generate packages from > the bootstrap, for practical reasons. > > If you remove ldefs-boot.el, make bootstrap fails. So you do the following? 1. Checkout a clean working copy of Emacs' CSV. 2. Run "make-dist --snapshot" to get a tarball (without .elc or info files).=20 3. Unpack this tarball. 4. Run ".configure" and "make bootstrap" on that tree. (I'm pleasantly surprised that works.) What about the patch below then? It makes sure that make-dist never distributes ldefs-boot.el (that way, ldefs-boot.el will never be installed either) and it ensures that a tarball created by the above method can bootstrap. Lute. Index: make-dist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/make-dist,v retrieving revision 1.212 diff -c -r1.212 make-dist *** make-dist 7 May 2005 15:28:12 -0000 1.212 --- make-dist 9 May 2005 12:08:34 -0000 *************** *** 351,356 **** --- 351,361 ---- test -f README && ln README ../${tempdir}/lisp (cd ../${tempdir}/lisp rm -f TAGS =3D* + if [ -f loaddefs.el ]; then + rm -f ldefs-boot.el + else + mv ldefs-boot.el loaddefs.el + fi rm -f site-init site-init.el site-init.elc rm -f site-load site-load.el site-load.elc rm -f site-start site-start.el site-start.elc