summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rvs/plugins/main.mk.in2
-rw-r--r--rvs/plugins/plugin.mk.in13
2 files changed, 7 insertions, 8 deletions
diff --git a/rvs/plugins/main.mk.in b/rvs/plugins/main.mk.in
index 8ffa1d7..f0401d1 100644
--- a/rvs/plugins/main.mk.in
+++ b/rvs/plugins/main.mk.in
@@ -30,7 +30,7 @@ build : $(addprefix build-,$(mods))
%/main.mk : plugin.mk %/; cp $< $@
-complete-% : %/ %/main.mk
+complete-% : %/ %/main.mk; :
build-% : %/ complete-% %/main.mk; $(MAKE) -C $<
install-% : %/ complete-% %/main.mk; $(MAKE) -C $< install
clean-% : %/ complete-% %/main.mk; $(MAKE) -C $< clean
diff --git a/rvs/plugins/plugin.mk.in b/rvs/plugins/plugin.mk.in
index ed5dca8..6980538 100644
--- a/rvs/plugins/plugin.mk.in
+++ b/rvs/plugins/plugin.mk.in
@@ -37,8 +37,13 @@ shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles)))
$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf
-$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf
+$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf.in
$(INSTALL_DATA) $< $@
+ $(SED) -i \
+ -e 's/$bname@/$(subst /,\/,$(name))/g' \
+ -e 's/$bver@/$(subst /,\/,$(ver))/g' \
+ $@
+
# (un)install ######################################################
@@ -68,12 +73,6 @@ $(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir)
-e 's/$bID@/$(subst /,\/,$(id))/g' \
$@
-plugin.conf : plugin.conf.in
- $(SED) \
- -e 's/$bname@/$(subst /,\/,$(name))/g' \
- -e 's/$bver@/$(subst /,\/,$(ver))/g' \
- $< > $@
-
$(DESTDIR)$(libexecdir)/$(rvs) $(myoutdir) :
$(MKDIR) $@