[PATCH libSM 2/2] doc: install generated images in $docdir

[Gaetan Nadon]

On Fri, 2010-02-05 at 10:12 -0800, Dan Nicholson wrote:

> On Fri, Feb 5, 2010 at 9:23 AM, Gaetan Nadon <memsize at videotron.ca> wrote:
> > The html installed doc is incomplete without the generated images.
> >
> > Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> > ---
> >  doc/Makefile.am |   21 +++++++++++++++++++++
> >  1 files changed, 21 insertions(+), 0 deletions(-)
> >
> > diff --git a/doc/Makefile.am b/doc/Makefile.am
> > index eea436b..ef42872 100644
> > --- a/doc/Makefile.am
> > +++ b/doc/Makefile.am
> > @@ -30,10 +30,31 @@ EXTRA_DIST = $(doc_sources)
> >  if ENABLE_DOCS
> >  if HAVE_GROFF
> >  doc_DATA = SMlib.txt SMlib.ps SMlib.html xsmp.txt xsmp.ps xsmp.html
> > +imagesdir = $(docdir)/images
> >
> >  CLEANFILES = $(doc_DATA)
> >  MOSTLYCLEANFILES = index.*
> >
> > +install-data-local:
> > +       test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
> > +       @d="$(srcdir)/images/"; \
> > +       list=`ls $$d`; \
> > +       for p in $$list; do \
> > +         echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$p'"; \
> > +         $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$p"; \
> > +       done;
> > +
> > +uninstall-local:
> > +       @if test -n $(DESTDIR)$(imagesdir); then \
> > +         if test -d $(DESTDIR)$(imagesdir); then \
> > +           list=`ls $(DESTDIR)$(imagesdir)`; \
> > +           for p in $$list; do \
> > +             echo " rm -f '$(DESTDIR)$(imagesdir)/$$p'"; \
> > +             rm -f "$(DESTDIR)$(imagesdir)/$$p"; \
> > +           done \
> > +         fi; \
> > +       fi;
> 
> I'm not sure this works because of the wildcard, but can you try:
> 
> images_DATA = $(srcdir)/images/*
> 
> That would be a lot simpler. I think even images_DATA = `ls
> $(srcdir)/images/*` would work.
> 

I think I tried before, but automake is explicit about not supporting
wildcard expansion.

27.3 Why doesn't Automake support wildcards?

http://www.gnu.org/software/automake/manual/automake.html#Wildcards


I have the xserver patches to complete and I should be done with this
work. They are all very similar, but enough differences to hide trouble.
The table here should help as well:
http://wiki.x.org/wiki/Development/Documentation/WritingDocumentation

A more challenging one is libX11. I changed the install dir to match the
source dir, otherwise cleaning one doc target would erase images from
another doc target as they were sharing the same install images dir.

Thanks





> --
> Dan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20100205/c4aacf90/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : http://lists.x.org/archives/xorg-devel/attachments/20100205/c4aacf90/attachment.pgp