[Xen-changelog] [xen master] xen/test/livepatch/Makefile: Install in DESTDIR/usr/lib/debug/xen-livepatch

[patchbot@xxxxxxx]

commit a38d1af5fb02bee68c9a30e38b97c6129815f943
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Wed Jun 7 15:00:17 2017 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Jun 14 12:03:27 2017 +0100

    xen/test/livepatch/Makefile: Install in DESTDIR/usr/lib/debug/xen-livepatch
    
    Dumping these patch files in /usr/lib/debug/xen-*.livepatch is a bit
    ugly.
    
    Also, refactor the Makefile to have a LIVEPATCHES variable, to reduce
    repetition.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Release-acked-by: Julien Grall <julien.grall@xxxxxxx>
---
 xen/test/livepatch/Makefile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile
index 76a779a..76d65cf 100644
--- a/xen/test/livepatch/Makefile
+++ b/xen/test/livepatch/Makefile
@@ -20,18 +20,21 @@ LIVEPATCH_BYE := xen_bye_world.livepatch
 LIVEPATCH_REPLACE := xen_replace_world.livepatch
 LIVEPATCH_NOP := xen_nop.livepatch
 
+LIVEPATCHES += $(LIVEPATCH)
+LIVEPATCHES += $(LIVEPATCH_BYE)
+LIVEPATCHES += $(LIVEPATCH_REPLACE)
+LIVEPATCHES += $(LIVEPATCH_NOP)
+
+LIVEPATCH_DEBUG_DIR ?= $(DEBUG_DIR)/xen-livepatch
+
 default: livepatch
 
 install: livepatch
-       $(INSTALL_DATA) $(LIVEPATCH) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH)
-       $(INSTALL_DATA) $(LIVEPATCH_BYE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE)
-       $(INSTALL_DATA) $(LIVEPATCH_REPLACE) 
$(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE)
-       $(INSTALL_DATA) $(LIVEPATCH_NOP) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_NOP)
+       $(INSTALL_DIR) $(DESTDIR)$(LIVEPATCH_DEBUG_DIR)
+       $(INSTALL_DATA) $(LIVEPATCHES) $(DESTDIR)$(LIVEPATCH_DEBUG_DIR)
+
 uninstall:
-       rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH)
-       rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE)
-       rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE)
-       rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_NOP)
+       cd $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) && rm -f $(LIVEPATCHES)
 
 .PHONY: clean
 clean::
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog