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

Dan Nicholson dbn.lists at gmail.com
Fri Feb 5 10:12:45 PST 2010


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.

--
Dan


More information about the xorg-devel mailing list