[gtk-doc] make: avoid non posix options in the makefiles



commit 87696c458ccc85ecbffe01a9e7b7124d0f02ac6e
Author: Stefan Sauer <ensonic users sf net>
Date:   Fri Feb 14 09:40:32 2014 +0100

    make: avoid non posix options in the makefiles
    
    Use cp -pf instead of cp -pu. Use cp -pR instead of cp -pr.
    Fixes #722479

 gtk-doc.make        |    6 +++---
 gtk-doc.notmpl.make |    2 +-
 tests/gtk-doc.make  |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index 584843f..dd31993 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -92,11 +92,11 @@ setup-build.stamp:
                    destdir=`dirname $(abs_builddir)/$$file` ;\
                    test -d "$$destdir" || mkdir -p "$$destdir"; \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
                done; \
            fi; \
            test -d $(abs_srcdir)/tmpl && \
-               { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+               { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
                chmod -R u+w $(abs_builddir)/tmpl; } \
        fi
        $(AM_V_at)touch setup-build.stamp
@@ -147,7 +147,7 @@ tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
        $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
        $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
          if test -w $(abs_srcdir) ; then \
-           cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+           cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
          fi \
        fi
        $(AM_V_at)touch tmpl-build.stamp
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index 764fd7c..e791656 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -92,7 +92,7 @@ setup-build.stamp:
                    destdir=`dirname $(abs_builddir)/$$file`; \
                    test -d "$$destdir" || mkdir -p "$$destdir"; \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
                done; \
            fi; \
        fi
diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
index 382bf9f..39fd8bf 100644
--- a/tests/gtk-doc.make
+++ b/tests/gtk-doc.make
@@ -74,11 +74,11 @@ setup-build.stamp: ts
            if test "x$$files" != "x" ; then \
                for file in $$files ; do \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
                done; \
            fi; \
            test -d $(abs_srcdir)/tmpl && \
-              { cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+              { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
               chmod -R u+w $(abs_builddir)/tmpl; } \
        fi
        @touch setup-build.stamp
@@ -126,7 +126,7 @@ tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
        gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) 2>&1 | tee -a gtkdoc-mktmpl.log
        @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
          if test -w $(abs_srcdir) ; then \
-           cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+           cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
          fi \
        fi
        @touch tmpl-build.stamp


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