Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Occasionally the cp -p fails with a non-zero return code. This will cause |
| 2 | the system abort the build. |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | |
| 6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 7 | |
| 8 | Index: rpm/rpmdb/Makefile.am |
| 9 | =================================================================== |
| 10 | --- rpm.orig/rpmdb/Makefile.am |
| 11 | +++ rpm/rpmdb/Makefile.am |
| 12 | @@ -234,11 +234,14 @@ lcov-report: |
| 13 | #lcov-upload: lcov |
| 14 | # rsync -rvz -e ssh --delete lcov/* ??? |
| 15 | |
| 16 | +$(builddir)/logio_recover_template: $(srcdir)/logio_recover_template |
| 17 | + @if test ".$(builddir)" != ".$(srcdir)"; then \ |
| 18 | + cp -fp $(srcdir)/logio_recover_template \ |
| 19 | + $(builddir)/logio_recover_template ; \ |
| 20 | + fi |
| 21 | + |
| 22 | logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template |
| 23 | -$(logio_BUILT): logio.awk logio.src logio_recover_template |
| 24 | - @test -e $(builddir)/logio_recover_template || \ |
| 25 | - cp -p $(srcdir)/logio_recover_template \ |
| 26 | - $(builddir)/logio_recover_template |
| 27 | +$(logio_BUILT): logio.awk logio.src $(builddir)/logio_recover_template |
| 28 | @rm -f $(logio_BUILT) |
| 29 | @$(AWK) -f $(srcdir)/logio.awk \ |
| 30 | -v header_file=logio_auto.h \ |