Skip to content

Commit

Permalink
make install for plugins: accept empty BUILD_PLUGIN lists
Browse files Browse the repository at this point in the history
  • Loading branch information
pstorz committed Nov 21, 2017
1 parent 4933d4d commit 3b385e6
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
7 changes: 4 additions & 3 deletions src/plugins/dird/Makefile.in
Expand Up @@ -52,11 +52,12 @@ plugtest: Makefile dir_plugins.c \
install: all
$(MKDIR) $(DESTDIR)$(plugindir)
$(CP) *.py *.py.template $(DESTDIR)$(plugindir)
@for plugin in $(BUILD_PLUGINS); do \
if test "x$(BUILD_PLUGINS)" != "x" ; then \
for plugin in $(BUILD_PLUGINS); do \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$plugin $(DESTDIR)$(plugindir); \
$(RMF) $(DESTDIR)$(plugindir)/$$plugin; \
done

done; \
fi
install-test-plugin: all
$(MKDIR) $(DESTDIR)$(plugindir)
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) example-plugin-dir.la $(DESTDIR)$(plugindir)
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/filed/Makefile.in
Expand Up @@ -96,6 +96,7 @@ install: all
$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
$(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
if test "x$(BUILD_PLUGINS)" != "x" ; then \
for plugin in $(BUILD_PLUGINS); do \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$plugin $(DESTDIR)$(plugindir); \
$(RMF) $(DESTDIR)$(plugindir)/$$plugin; \
Expand All @@ -113,7 +114,8 @@ install: all
$(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/$$i; \
done; \
fi; \
done
done;\
fi

install-test-plugin: all
$(MKDIR) $(DESTDIR)$(plugindir)
Expand Down
6 changes: 4 additions & 2 deletions src/plugins/stored/Makefile.in
Expand Up @@ -72,10 +72,12 @@ plugtest: Makefile sd_plugins.c \
install: all
$(MKDIR) $(DESTDIR)$(plugindir)
$(CP) *.py *.py.template $(DESTDIR)$(plugindir)
@for plugin in $(BUILD_PLUGINS); do \
if test "x$(BUILD_PLUGINS)" != "x" ; then \
for plugin in $(BUILD_PLUGINS); do \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$plugin $(DESTDIR)$(plugindir); \
$(RMF) $(DESTDIR)$(plugindir)/$$plugin; \
done
done; \
fi

install-test-plugin:
$(MKDIR) $(DESTDIR)$(plugindir)
Expand Down

0 comments on commit 3b385e6

Please sign in to comment.