diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-06-04 23:34:22 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-06-04 23:34:22 +0000 |
| commit | 68fb019d4044b9878aef4ca223fc13c19ffc7d0c (patch) | |
| tree | 0ffc36325838b5be2c70807ea46d5a38a7b775e9 | |
| parent | 130fa8f739ff09aedb520c33239f53d06cfe9bd5 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gtk-doc.mak | 7 |
2 files changed, 14 insertions, 1 deletions
@@ -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 --- 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 |