* [Qemu-devel] [PATCH] build-sys: fix make install regression
@ 2016-09-20 9:01 riku.voipio
2016-09-20 9:15 ` Marc-André Lureau
2016-09-20 10:05 ` Markus Armbruster
0 siblings, 2 replies; 4+ messages in thread
From: riku.voipio @ 2016-09-20 9:01 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio, Marc-André Lureau, Markus Armbruster
From: Riku Voipio <riku.voipio@linaro.org>
Since bd6092e Replace qmp-commands.hx by docs/qmp-commands.txt
make install fails if building out of source-tree.
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
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"
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] build-sys: fix make install regression
2016-09-20 9:01 [Qemu-devel] [PATCH] build-sys: fix make install regression riku.voipio
@ 2016-09-20 9:15 ` Marc-André Lureau
2016-09-20 10:05 ` Markus Armbruster
1 sibling, 0 replies; 4+ messages in thread
From: Marc-André Lureau @ 2016-09-20 9:15 UTC (permalink / raw)
To: riku voipio; +Cc: qemu-devel, Marc-André Lureau, Markus Armbruster
Hi
----- Original Message -----
> From: Riku Voipio <riku.voipio@linaro.org>
>
> Since bd6092e Replace qmp-commands.hx by docs/qmp-commands.txt
> make install fails if building out of source-tree.
>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> 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"
> --
> 2.1.4
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] build-sys: fix make install regression
2016-09-20 9:01 [Qemu-devel] [PATCH] build-sys: fix make install regression riku.voipio
2016-09-20 9:15 ` Marc-André Lureau
@ 2016-09-20 10:05 ` Markus Armbruster
2016-09-20 10:57 ` Peter Maydell
1 sibling, 1 reply; 4+ messages in thread
From: Markus Armbruster @ 2016-09-20 10:05 UTC (permalink / raw)
To: riku.voipio; +Cc: qemu-devel, Marc-André Lureau, Peter Maydell
riku.voipio@linaro.org writes:
> From: Riku Voipio <riku.voipio@linaro.org>
>
> Since bd6092e Replace qmp-commands.hx by docs/qmp-commands.txt
> make install fails if building out of source-tree.
>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> ---
> 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 <armbru@redhat.com>
Peter, would you be willing to apply this directly as a build fix, or
would you prefer a pull request?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] build-sys: fix make install regression
2016-09-20 10:05 ` Markus Armbruster
@ 2016-09-20 10:57 ` Peter Maydell
0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2016-09-20 10:57 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Riku Voipio, QEMU Developers, Marc-André Lureau
On 20 September 2016 at 11:05, Markus Armbruster <armbru@redhat.com> wrote:
> riku.voipio@linaro.org writes:
>
>> From: Riku Voipio <riku.voipio@linaro.org>
>>
>> Since bd6092e Replace qmp-commands.hx by docs/qmp-commands.txt
>> make install fails if building out of source-tree.
>>
>> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Cc: Markus Armbruster <armbru@redhat.com>
>> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
>> ---
>> 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 <armbru@redhat.com>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-20 10:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-20 9:01 [Qemu-devel] [PATCH] build-sys: fix make install regression riku.voipio
2016-09-20 9:15 ` Marc-André Lureau
2016-09-20 10:05 ` Markus Armbruster
2016-09-20 10:57 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.