This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] Add support for html/install-html.
On Sun, May 21, 2006 at 04:51:31PM -0300, Alexandre Oliva wrote:
> On May 19, 2006, "Carlos O'Donell" <carlos@codesourcery.com> wrote:
>
> > libjava/classpath/
>
> I'm not sure I can or should approve this, but the rest is ok, except
> for...
I will have to send this to the GNU Classpath maintainers?
> > Index: gcc/Makefile.in
>
> > -$(htmldir)/%/index.html: %.texi
> > +# Note: lang.html is a special target which triggers language fragment
> > +# html builds. It is not included in HTMLS because we do not install
> > +# language html files.
> > +html:: $(HTMLS) lang.html
> > +
> > +$(gcc_htmldir)/%: %.texi
> > $(mkinstalldirs) $(@D)
> > - rm -f $(@D)/*
> > - $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
> > + rm -f $(@)/*
> > + $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@) $<
>
> > # Duplicate entry to handle renaming of gccinstall
> > -$(htmldir)/gccinstall/index.html: $(TEXI_GCCINSTALL_FILES)
> > +$(gcc_htmldir)/gccinstall: $(TEXI_GCCINSTALL_FILES)
> > $(mkinstalldirs) $(@D)
> > - echo rm -f $(@D)/*
> > - $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
> > + echo rm -f $(@)/*
> > + $(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@) $<
>
> I'd rather spell $(@) as $@. The change from $(@D) to $@ got me
> confused for a moment, but now i see what you're doing.
Ok.
> That said, I don't think I like the idea of directories as targets.
> They seem too fragile. Any reason to have decided to change it from
> <dir>/index.html to just <dir>? If not, I'd rather keep it the way it
> was.
>
> Ok otherwise.
Rather than maintain two separate variables I modified the 'html' target
to accept the same targets as 'install-html.'
The install-html rule uses "test -f" and "test -d" to determine if a
single file, or an entire directory, should be installed. The targets
are either single files or directories, and the install rule uses this
information to determine the correct action.
The proposed install-html rule is essentially a backport of the autoconf
CVS install-html rule. I figured it would ease an eventual transition to
a newer autoconf if we began using the same rules for the same targets.
Some day we will delete the install-html rule and the default will DTRT.
Cheers,
Carlos.
--
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716