[Qemu-devel] [PATCH 1/1] Makefile: Correct path in stripping tool binaries

[Qemu-devel] [PATCH 1/1] Makefile: Correct path in stripping tool binaries

[Sam Bobroff]

Allow "make install" to handle tool binaries that reside in
sub-directories.

Without this patch "make install" will fail if it needs to strip
a tool binary (e.g. debugging is not enabled) that is installed
from a subdirectory. An example is fsdev/virtfs-proxy-helper.

Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
---
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d830483..9c23265 100644
--- a/Makefile
+++ b/Makefile
@@ -380,7 +380,7 @@ install-datadir install-localstatedir
 ifneq ($(TOOLS),)
 	$(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
 ifneq ($(STRIP),)
-	$(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%")
+	$(STRIP) $(foreach T,$(TOOLS),"$(DESTDIR)$(bindir)/$(notdir $T)")
 endif
 endif
 ifneq ($(CONFIG_MODULES),)
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 1/1] Makefile: Correct path in stripping tool binaries

[Peter Maydell]

On 4 June 2014 02:37, Sam Bobroff <sam.bobroff@au1.ibm.com> wrote:
> Allow "make install" to handle tool binaries that reside in
> sub-directories.
>
> Without this patch "make install" will fail if it needs to strip
> a tool binary (e.g. debugging is not enabled) that is installed
> from a subdirectory. An example is fsdev/virtfs-proxy-helper.
>
> Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
> ---
>  Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index d830483..9c23265 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -380,7 +380,7 @@ install-datadir install-localstatedir
>  ifneq ($(TOOLS),)
>         $(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
>  ifneq ($(STRIP),)
> -       $(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%")
> +       $(STRIP) $(foreach T,$(TOOLS),"$(DESTDIR)$(bindir)/$(notdir $T)")
>  endif
>  endif
>  ifneq ($(CONFIG_MODULES),)
> --
> 1.7.10.4

We should probably also do this on the other invocation of $(STRIP}
for installs into libexecdir.

thanks
-- PMM

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/1] Makefile: Correct path in stripping tool binaries

[Michael Tokarev]

04.06.2014 05:37, Sam Bobroff пишет:
> Allow "make install" to handle tool binaries that reside in
> sub-directories.
> 
> Without this patch "make install" will fail if it needs to strip
> a tool binary (e.g. debugging is not enabled) that is installed
> from a subdirectory. An example is fsdev/virtfs-proxy-helper.

Applied to -trivial, thank you!

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/1] Makefile: Correct path in stripping tool binaries

[Michael Tokarev]

22.06.2014 10:30, Michael Tokarev wrote:
> 04.06.2014 05:37, Sam Bobroff wrote:
>> Allow "make install" to handle tool binaries that reside in
>> sub-directories.
>>
>> Without this patch "make install" will fail if it needs to strip
>> a tool binary (e.g. debugging is not enabled) that is installed
>> from a subdirectory. An example is fsdev/virtfs-proxy-helper.
> 
> Applied to -trivial, thank you!

Actually, the more I think about this, the more I dislike it.  I'll
introduce a common function to install programs instead.

Thanks,

/mjt