Re: [PATCH] make-dist fixes and clean-ups

[Lute Kamstra <Lute.Kamstra.lists@xs4all.nl>]

Jérôme Marant <jmarant@free.fr> writes:

> Lute Kamstra <Lute.Kamstra.lists@xs4all.nl> writes:
>
>> Jérôme Marant <jmarant@free.fr> 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). 
  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
===================================================================
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 =*
+   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