[gtk-doc] make: fix setup.stamp logic

[Stefan Kost <stefkost src gnome org>]

commit b3debfa020f8d72dc3a6b3c10e970ebadfb4679d
Author: Stefan Kost <ensonic users sf net>
Date:   Thu Jan 27 17:08:54 2011 +0200

    make: fix setup.stamp logic
    
    We need to copy all files that exist. Also include expand_content_files.

 gtk-doc.make        |    6 +++---
 gtk-doc.notmpl.make |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index 00963af..6690084 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -75,9 +75,9 @@ setup-build.stamp::
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	   cp -a $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \
 	   cp -a $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \
-	   if test "x$(content_files)" != "x" ; then \
-	       for file in $(content_files) ; do \
-	           test -f $(abs_srcdir)/$$file || \
+	   if test "x$(content_files) $(expand_content_files)" != "x" ; then \
+	       for file in $(content_files) $(expand_content_files) ; do \
+	           test -f $(abs_srcdir)/$$file && \
 	               cp -a $(abs_srcdir)/$$file $(abs_builddir)/; \
 	       done \
 	   fi \
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index c1050a1..0ad5da1 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -75,9 +75,9 @@ setup-build.stamp::
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	   cp -a $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \
 	   cp -a $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \
-	   if test "x$(content_files)" != "x" ; then \
-	       for file in $(content_files) ; do \
-	           test -f $(abs_srcdir)/$$file || \
+	   if test "x$(content_files) $(expand_content_files)" != "x" ; then \
+	       for file in $(content_files) $(expand_content_files) ; do \
+	           test -f $(abs_srcdir)/$$file && \
 	               cp -a $(abs_srcdir)/$$file $(abs_builddir)/; \
 	       done \
 	   fi \