diff mbox

[v6,6/8] Makefile: install modules with "make install"

Message ID 1378906448-15834-7-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng Sept. 11, 2013, 1:34 p.m. UTC
Install all the subdirs for modules under configure option "moddir".

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Paolo Bonzini Sept. 11, 2013, 1:50 p.m. UTC | #1
Il 11/09/2013 15:34, Fam Zheng ha scritto:
> Install all the subdirs for modules under configure option "moddir".
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  Makefile | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index c50b4b3..ca84d32 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -360,6 +360,12 @@ install-datadir install-localstatedir
>  ifneq ($(TOOLS),)
>  	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
>  endif
> +ifneq ($(CONFIG_MODULES),)

Perhaps modules-m instead of CONFIG_MODULES would be more clearer given
the "for" line immediately below.

> +	for s in $(patsubst %.mo,%.so,$(modules-m)); do \

DSOSUF here.

> +		$(INSTALL_DIR) "$(DESTDIR)$(moddir)/$$(dirname $$s)"; \
> +		$(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(moddir)/$$(dirname $$s)"; \

Paolo

> +	done
> +endif
>  ifneq ($(HELPERS-y),)
>  	$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
>  	$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
>
Fam Zheng Sept. 12, 2013, 2 a.m. UTC | #2
On Wed, 09/11 15:50, Paolo Bonzini wrote:
> Il 11/09/2013 15:34, Fam Zheng ha scritto:
> > Install all the subdirs for modules under configure option "moddir".
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >  Makefile | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/Makefile b/Makefile
> > index c50b4b3..ca84d32 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -360,6 +360,12 @@ install-datadir install-localstatedir
> >  ifneq ($(TOOLS),)
> >  	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
> >  endif
> > +ifneq ($(CONFIG_MODULES),)
> 
> Perhaps modules-m instead of CONFIG_MODULES would be more clearer given
> the "for" line immediately below.

modules-m has things even configured without --enable-modules, I think we don't install .so here.

> 
> > +	for s in $(patsubst %.mo,%.so,$(modules-m)); do \
> 
> DSOSUF here.

OK.

Fam
> 
> > +		$(INSTALL_DIR) "$(DESTDIR)$(moddir)/$$(dirname $$s)"; \
> > +		$(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(moddir)/$$(dirname $$s)"; \
> 
> Paolo
> 
> > +	done
> > +endif
> >  ifneq ($(HELPERS-y),)
> >  	$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
> >  	$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
> > 
>
diff mbox

Patch

diff --git a/Makefile b/Makefile
index c50b4b3..ca84d32 100644
--- a/Makefile
+++ b/Makefile
@@ -360,6 +360,12 @@  install-datadir install-localstatedir
 ifneq ($(TOOLS),)
 	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
+ifneq ($(CONFIG_MODULES),)
+	for s in $(patsubst %.mo,%.so,$(modules-m)); do \
+		$(INSTALL_DIR) "$(DESTDIR)$(moddir)/$$(dirname $$s)"; \
+		$(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(moddir)/$$(dirname $$s)"; \
+	done
+endif
 ifneq ($(HELPERS-y),)
 	$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
 	$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"