Re: [Qemu-devel] [PATCH] build-sys: fix make install regression

[Peter Maydell]

On 20 September 2016 at 11:05, Markus Armbruster <address@hidden> wrote:
> address@hidden writes:
>
>> From: Riku Voipio <address@hidden>
>>
>> Since bd6092e Replace qmp-commands.hx by docs/qmp-commands.txt
>> make install fails if building out of source-tree.
>>
>> Cc: Marc-André Lureau <address@hidden>
>> Cc: Markus Armbruster <address@hidden>
>> Signed-off-by: Riku Voipio <address@hidden>
>> ---
>>  Makefile | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 81ca388..444ae37 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -431,7 +431,7 @@ endif
>>  install-doc: $(DOCS)
>>       $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
>>       $(INSTALL_DATA) qemu-doc.html  qemu-tech.html 
>> "$(DESTDIR)$(qemu_docdir)"
>> -     $(INSTALL_DATA) docs/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"
>> +     $(INSTALL_DATA) $(SRC_PATH)/docs/qmp-commands.txt 
>> "$(DESTDIR)$(qemu_docdir)"
>>  ifdef CONFIG_POSIX
>>       $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
>>       $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
>
> I grepped through the tree, and this is the only oversight.  Well,
> there's a QMP/qmp-commands.txt in docs/xen-save-devices-state.txt, but
> that's due to commit eb02dc0.  I'll post the obvious patch.  Meanwhile:
>
> Reviewed-by: Markus Armbruster <address@hidden>
>
> Peter, would you be willing to apply this directly as a build fix, or
> would you prefer a pull request?

Applied to master, thanks.

-- PMM