From: Jan Schmidt Date: Wed, 4 Jun 2008 23:34:22 +0000 (+0000) Subject: gtk-doc.mak: Don't copy html/*.png files unless they don't already exist in the destd... X-Git-Tag: RELEASE-0_10_20~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68fb019d4044b9878aef4ca223fc13c19ffc7d0c;p=platform%2Fupstream%2Fgst-common.git gtk-doc.mak: Don't copy html/*.png files unless they don't already exist in the destdir. Fixes distcheck failure caus... 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-05 Jan Schmidt + + * 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 * plugins.xsl: diff --git a/gtk-doc.mak b/gtk-doc.mak index 7625b7a..011e9c0 100644 --- 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