diff options
| author | Luke Shumaker <luke@HP-dv6426us-u904.(none)> | 2009-10-29 22:12:03 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-26 00:30:18 -0600 |
| commit | 2db6b833176b0a0a55de21a38a83bd97df537191 (patch) | |
| tree | d243f6b8dca3801cb60a83fa7376ba6bc56f7033 | |
| parent | 22568919e9bdf29557be5aa3c69857d815a93751 (diff) | |
rvs builds without errors
| -rw-r--r-- | rvs/plugins/main.mk.in | 2 | ||||
| -rw-r--r-- | rvs/plugins/plugin.mk.in | 13 |
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) $@ |