From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: Re: [PATCH 3/3] xen: Use $(T) and $(D) aliases in install target Date: Thu, 18 Jul 2013 08:26:18 +0100 Message-ID: <51E7B4BA02000078000E5D2A@nat28.tlf.novell.com> References: <1374075441.26728.14.camel@kazak.uk.xensource.com> <1374075473-32502-3-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1UzibW-0002PG-Vc for xen-devel@lists.xenproject.org; Thu, 18 Jul 2013 07:26:23 +0000 In-Reply-To: <1374075473-32502-3-git-send-email-ian.campbell@citrix.com> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: julien.grall@citrix.com, xen-devel , tim@xen.org, keir@xen.org, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org >>> On 17.07.13 at 17:37, Ian Campbell wrote: > This is consistent with the uninstall target and also shortens some longish > lines. > > $(Z) be used in the depencies when it is declared in this way, so expand it. I was about to ask the very question of whether this works in response to the first patch, but luckily went through the others first. If this doesn't work, then the first patch shouldn't introduce it, and then this one doesn't need to fix it (and you can drop the line above, which appears to be lacking a "can't" anyway). And I suppose you don't need to define Z then at all for _build? Jan > Suggested-by: Jan Beulich > Signed-off-by: Ian Campbell > --- > xen/Makefile | 32 +++++++++++++++++--------------- > 1 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/xen/Makefile b/xen/Makefile > index 0a20662..2bb5851 100644 > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -30,26 +30,28 @@ endif > > .PHONY: _build > _build: Z=$(CONFIG_XEN_INSTALL_SUFFIX) > -_build: $(TARGET)$(Z) > +_build: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) > > .PHONY: _install > _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) > -_install: $(TARGET)$(Z) > - [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot > - $(INSTALL_DATA) $(TARGET)$(Z) $(DESTDIR)/boot/$(notdir > $(TARGET))-$(XEN_FULLVERSION) > - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir > $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION) > - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir > $(TARGET))-$(XEN_VERSION) > - ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION) $(DESTDIR)/boot/$(notdir > $(TARGET)) > - $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir > $(TARGET))-syms-$(XEN_FULLVERSION) > +_install: D=$(DESTDIR) > +_install: T=$(notdir $(TARGET)) > +_install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) > + [ -d $(D)/boot ] || $(INSTALL_DIR) $(D)/boot > + $(INSTALL_DATA) $(TARGET)$(Z) $(D)/boot/$(T)-$(XEN_FULLVERSION) > + ln -f -s $(T)-$(XEN_FULLVERSION) > $(D)/boot/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION) > + ln -f -s $(T)-$(XEN_FULLVERSION) $(D)/boot/$(T)-$(XEN_VERSION) > + ln -f -s $(T)-$(XEN_FULLVERSION) $(D)/boot/$(T) > + $(INSTALL_DATA) $(TARGET)-syms $(D)/boot/$(T)-syms-$(XEN_FULLVERSION) > if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ > - [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(EFI_DIR); \ > - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir > $(TARGET))-$(XEN_FULLVERSION).efi; \ > - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi > $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; > \ > - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi > $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \ > - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi > $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \ > + [ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \ > + $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \ > + ln -sf $(T)-$(XEN_FULLVERSION).efi > $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \ > + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ > + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ > if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ > - $(INSTALL_DATA) $(TARGET).efi > $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir > $(TARGET))-$(XEN_FULLVERSION).efi; \ > - elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && > pwd)/%,%,$(DESTDIR))" ]; then \ > + $(INSTALL_DATA) $(TARGET).efi > $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ > + elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then > \ > echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ > fi; \ > fi > -- > 1.7.2.5