diff mbox

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

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

Commit Message

Fam Zheng Sept. 12, 2013, 7:04 a.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

Daniel P. Berrangé Sept. 12, 2013, 2:06 p.m. UTC | #1
On Thu, Sep 12, 2013 at 03:04:57PM +0800, Fam Zheng wrote:
> 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 ef76967..00c2a52 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,%(DSOSUF),$(modules-m)); do \

Typo, causing install failure:

for s in block/iscsi(DSOSUF) block/curl(DSOSUF) block/rbd(DSOSUF) block/gluster(DSOSUF) block/ssh(DSOSUF); do \
	install -d -m 0755 "/home/berrange/usr/qemu-git-mod/lib/qemu/$(dirname $s)"; \
	libtool --quiet --mode=install install -c -m 0755  $s "/home/berrange/usr/qemu-git-mod/lib/qemu/$(dirname $s)"; \
done
/bin/sh: -c: line 0: syntax error near unexpected token `('
/bin/sh: -c: line 0: `for s in block/iscsi(DSOSUF) block/curl(DSOSUF) block/rbd(DSOSUF) block/gluster(DSOSUF) block/ssh(DSOSUF); do \'
make: *** [install] Error 1


Just  s/%(DSOSUF)/%$(DSOSUF)/ I believe



Daniel
Fam Zheng Sept. 13, 2013, 1:27 a.m. UTC | #2
On Thu, 09/12 15:06, Daniel P. Berrange wrote:
> On Thu, Sep 12, 2013 at 03:04:57PM +0800, Fam Zheng wrote:
> > 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 ef76967..00c2a52 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,%(DSOSUF),$(modules-m)); do \
> 
> Typo, causing install failure:
> 
> for s in block/iscsi(DSOSUF) block/curl(DSOSUF) block/rbd(DSOSUF) block/gluster(DSOSUF) block/ssh(DSOSUF); do \
> 	install -d -m 0755 "/home/berrange/usr/qemu-git-mod/lib/qemu/$(dirname $s)"; \
> 	libtool --quiet --mode=install install -c -m 0755  $s "/home/berrange/usr/qemu-git-mod/lib/qemu/$(dirname $s)"; \
> done
> /bin/sh: -c: line 0: syntax error near unexpected token `('
> /bin/sh: -c: line 0: `for s in block/iscsi(DSOSUF) block/curl(DSOSUF) block/rbd(DSOSUF) block/gluster(DSOSUF) block/ssh(DSOSUF); do \'
> make: *** [install] Error 1
> 
> 
> Just  s/%(DSOSUF)/%$(DSOSUF)/ I believe
> 
Yes, thanks for catching.

Fam
diff mbox

Patch

diff --git a/Makefile b/Makefile
index ef76967..00c2a52 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,%(DSOSUF),$(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)"