| Message ID | 1399546618-15401-1-git-send-email-mjt@msgid.tls.msk.ru |
|---|---|
| State | New |
| Headers | show |
On Thu, 05/08 14:56, Michael Tokarev wrote: > Commit 52ba784d3 replaced $(STRIP_OPT) with $(STRIP) in some > places (for example, Makefile.target), but not all of them. > There are a few places remain in main Makefile which still > uses $(STRIP_OPT). Replace these places with $(STRIP) too. > > While at it, simplify variable pattern substitution of the > surrounding places, change $(patsubst pat,rep,$(var)) into > $(var:pat=rep) which is much easier to read (this is probably > a good idea to do everywhere). > > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> > Cc: Fam Zheng <famz@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> > --- > Makefile | 16 ++++++++++++---- > Makefile.target | 2 +- > 2 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/Makefile b/Makefile > index 423e373..23ca444 100644 > --- a/Makefile > +++ b/Makefile > @@ -372,17 +372,25 @@ install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ > install-datadir install-localstatedir > $(INSTALL_DIR) "$(DESTDIR)$(bindir)" > ifneq ($(TOOLS),) > - $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" > + $(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)" > +ifneq ($(STRIP),) > + $(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%") > +endif > endif > ifneq ($(CONFIG_MODULES),) > $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" > - for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \ > - $(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ > + for s in $(modules-m:.mo=$(DSOSUF)); do \ > + t="$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ > + $(INSTALL_PROG) $$s "$$t"; \ > + test -z "$(STRIP)" || $(STRIP) "$$t"; \ > done > endif > ifneq ($(HELPERS-y),) > $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)" > - $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" > + $(INSTALL_PROG) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" > +ifneq ($(STRIP),) > + $(STRIP) $(HELPERS-y:%="$(DESTDIR)$(libexecdir)/%") > +endif > endif > ifneq ($(BLOBS),) > set -e; for x in $(BLOBS); do \ > diff --git a/Makefile.target b/Makefile.target > index 6d8fde8..8de8b12 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -196,7 +196,7 @@ install: all > ifneq ($(PROGS),) > $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" > ifneq ($(STRIP),) > - $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) > + $(STRIP) $(PROGS:%="$(DESTDIR)$(bindir)/%") > endif > endif > ifdef CONFIG_TRACE_SYSTEMTAP > -- > 1.7.10.4 > >
diff --git a/Makefile b/Makefile index 423e373..23ca444 100644 --- a/Makefile +++ b/Makefile @@ -372,17 +372,25 @@ install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ install-datadir install-localstatedir $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" + $(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)" +ifneq ($(STRIP),) + $(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%") +endif endif ifneq ($(CONFIG_MODULES),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" - for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \ - $(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + for s in $(modules-m:.mo=$(DSOSUF)); do \ + t="$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \ + $(INSTALL_PROG) $$s "$$t"; \ + test -z "$(STRIP)" || $(STRIP) "$$t"; \ done endif ifneq ($(HELPERS-y),) $(INSTALL_DIR) "$(DESTDIR)$(libexecdir)" - $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" + $(INSTALL_PROG) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" +ifneq ($(STRIP),) + $(STRIP) $(HELPERS-y:%="$(DESTDIR)$(libexecdir)/%") +endif endif ifneq ($(BLOBS),) set -e; for x in $(BLOBS); do \ diff --git a/Makefile.target b/Makefile.target index 6d8fde8..8de8b12 100644 --- a/Makefile.target +++ b/Makefile.target @@ -196,7 +196,7 @@ install: all ifneq ($(PROGS),) $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" ifneq ($(STRIP),) - $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) + $(STRIP) $(PROGS:%="$(DESTDIR)$(bindir)/%") endif endif ifdef CONFIG_TRACE_SYSTEMTAP
Commit 52ba784d3 replaced $(STRIP_OPT) with $(STRIP) in some places (for example, Makefile.target), but not all of them. There are a few places remain in main Makefile which still uses $(STRIP_OPT). Replace these places with $(STRIP) too. While at it, simplify variable pattern substitution of the surrounding places, change $(patsubst pat,rep,$(var)) into $(var:pat=rep) which is much easier to read (this is probably a good idea to do everywhere). Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Cc: Fam Zheng <famz@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> --- Makefile | 16 ++++++++++++---- Makefile.target | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-)