gtk-doc.mak: Don't copy html/*.png files unless they don't already exist in the destd...

Original commit message from CVS:
* gtk-doc.mak:
Don't copy html/*.png files unless they don't already exist
in the destdir. Fixes distcheck failure caused by permissions
problems trying to copy a file into the destdir when it already
exists.

diff --git a/ChangeLog b/ChangeLog
index 029dc87..438f72b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-05  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * gtk-doc.mak:
+       Don't copy html/*.png files unless they don't already exist
+       in the destdir. Fixes distcheck failure caused by permissions
+       problems trying to copy a file into the destdir when it already
+       exists.
+
 2008-05-28  Stefan Kost  <ensonic@users.sf.net>
 
        * plugins.xsl:

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 7625b7a..011e9c0 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -263,12 +263,17 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
        -cp $(srcdir)/sgml/*.xml $(distdir)/xml
        -cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(srcdir)/html/*.png $(distdir)/html
+       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
        -cp $(srcdir)/html/$(DOC_MODULE).devhelp* $(distdir)/html
 
        images=$(HTML_IMAGES) ;               \
        for i in "" $$images ; do                     \
          if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
        done
+       images="$(srcdir)/html/*.png" ;               \
+       for i in "" $$images ; do                     \
+         fname=`basename $$i` ;                      \
+         if test ! -f "$(distdir)/html/$$fname"; then cp $$i $(distdir)/html ; fi; \
+       done 
 
 .PHONY : dist-hook-local