[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Revision 103117 on the Emacs trunk.

From: Eli Zaretskii
Subject: Re: Revision 103117 on the Emacs trunk.
Date: Sat, 05 Feb 2011 13:47:18 +0200

> From: Katsumi Yamaoka <address@hidden>
> Cc: Ted Zlatanov <address@hidden>,  address@hidden,  address@hidden
> Date: Sat, 05 Feb 2011 18:52:08 +0900
> Eli Zaretskii <address@hidden> wrote:
> > The doc/misc/ChangeLog entry for this revision says:
> >     * Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
> >     manuals.
> > but there are no such targets in doc/misc/Makefile.in, and in fact the
> > merge commit includes no changes to doc/misc/Makefile.in at all.
> > What happened?
> Sorry, I forgot merging a change to it.  I'll try it...

Thanks.  However, your change is just this:

  === modified file 'doc/misc/Makefile.in'
  --- doc/misc/Makefile.in        2011-01-26 08:36:39 +0000
  +++ doc/misc/Makefile.in        2011-02-05 11:23:52 +0000
  @@ -209,6 +209,12 @@ mkinfodir = @cd ${srcdir}; test -d ${inf

   info: $(INFO_TARGETS)

  +webhack: clean
  +       echo '@set WEBHACKDEVEL' > overrides.texi
  +nowebhack: clean
  +       echo '@clear WEBHACKDEVEL' > overrides.texi
   dvi: $(DVI_TARGETS)

I think at least the prerequisites should be fixed, for those several
manuals which now depend on overrides.texi to build (unless we go the
way I suggest below).

Also, overrides.texi is in the repository, but these two new rules
will overwrite it, and the modified overrides.texi could then easily
be committed by mistake as part of the next "bzr ci", thus propagating
a file with "@set WEBHACKDEVEL" to everyone else.  That's bad, I

Finally, I believe there are shells out there which will not overwrite
an existing file with the ">" redirection; you need to remove the file

Bottom line, I think it will be much better to remove overrides.texi
altogether, and then modify the `webhack' target as follows:

        $(MAKE) all MAKEINFO_OPTS="-DWEBHACKDEVEL --force -I$(emacsdir)"

Could you see if this will do what you want?

reply via email to

[Prev in Thread] Current Thread [Next in Thread]