[gtk-doc] make: tune the setup rule



commit 42351c9c0f0b26896baa0f72ea436ec1603716a4
Author: Stefan Kost <ensonic users sf net>
Date:   Mon May 2 14:59:50 2011 +0300

    make: tune the setup rule
    
    Add || true to avoid the target from prinitn (an ignored) failure, as skipping
    a copy is okay.

 gtk-doc.make        |   20 ++++++++++----------
 gtk-doc.notmpl.make |   16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index 07971c3..d516f12 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -76,16 +76,16 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo '  DOC   Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi; \
-	   test -f $(abs_srcdir)/tmpl && \
-	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi; \
+	    test -f $(abs_srcdir)/tmpl && \
+	        cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	fi
 	@touch setup-build.stamp
 
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index 3f95d9e..16543f5 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -76,14 +76,14 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo '  DOC   Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -p $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi \
 	fi
 	@touch setup-build.stamp
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]