<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0">
</HEAD>
<BODY>
On Fri, 2010-02-05 at 10:12 -0800, Dan Nicholson wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
On Fri, Feb 5, 2010 at 9:23 AM, Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>> wrote:
> The html installed doc is incomplete without the generated images.
>
> Signed-off-by: Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>>
> ---
> 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.
</PRE>
</BLOCKQUOTE>
I think I tried before, but automake is explicit about not supporting wildcard expansion.<BR>
<BR>
<B><FONT SIZE="4">27.3 Why doesn't Automake support wildcards?</FONT></B>
<BR>
<A HREF="http://www.gnu.org/software/automake/manual/automake.html#Wildcards">http://www.gnu.org/software/automake/manual/automake.html#Wildcards</A><BR>
<BR>
<BR>
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: <A HREF="http://wiki.x.org/wiki/Development/Documentation/WritingDocumentation">http://wiki.x.org/wiki/Development/Documentation/WritingDocumentation</A><BR>
<BR>
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.<BR>
<BR>
Thanks<BR>
<BR>
<BR>
<BR>
<BR>
<BLOCKQUOTE TYPE=CITE>
<PRE>
--
Dan
</PRE>
</BLOCKQUOTE>
</BODY>
</HTML>