[4.0] ac3bbf0 Use install instead of cp.

Lasse Karstensen lkarsten at varnish-software.com
Tue Jan 27 13:52:20 CET 2015


commit ac3bbf095f9eb842b0d92714666ca5953e6afee1
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Tue Jan 27 13:48:01 2015 +0100

    Use install instead of cp.
    
    Conflicts:
    	doc/sphinx/Makefile.am

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index c872ddd..dbc9e49 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -148,12 +148,12 @@ reference:
 	test -d $@ || mkdir $@
 BUILT_SOURCES += reference
 
-reference/vmod_std.generated.rst: $(top_builddir)/lib/libvmod_std/vmod_std.rst
-	cp $? $@
+reference/vmod_std.generated.rst: reference $(top_builddir)/lib/libvmod_std/vmod_std.rst
+	install -D $(top_builddir)/lib/libvmod_std/vmod_std.rst $@
 BUILT_SOURCES += reference/vmod_std.generated.rst
 
-reference/vmod_directors.generated.rst: $(top_builddir)/lib/libvmod_directors/vmod_directors.rst
-	cp $? $@
+reference/vmod_directors.generated.rst: reference $(top_builddir)/lib/libvmod_directors/vmod_directors.rst
+	install -D $(top_builddir)/lib/libvmod_directors/vmod_directors.rst $@
 BUILT_SOURCES += reference/vmod_directors.generated.rst
 
 EXTRA_DIST += $(BUILT_SOURCES)



More information about the varnish-commit mailing list