diff mbox

build-sys: fix make install regression

Message ID 1474362094-2293-1-git-send-email-riku.voipio@linaro.org
State Accepted
Commit a008535b9fa396226ff9cf78b8ac5f3584bda58e
Headers show

Commit Message

Riku Voipio Sept. 20, 2016, 9:01 a.m. UTC 
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(-)

-- 
2.1.4

Comments

Peter Maydell Sept. 20, 2016, 10:57 a.m. UTC | #1 
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
diff mbox

Patch

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"