From 206e003ca6f5b2500976f04a0dbb0b8a167fb3bf Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 24 Jun 2015 23:31:22 -0600
Subject: commit changes that have been sitting there for years, being copied
 from drive to drive

---
 rvs/plugins/plugin.mk.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'rvs/plugins/plugin.mk.in')

diff --git a/rvs/plugins/plugin.mk.in b/rvs/plugins/plugin.mk.in
index 250f03a..d631e4e 100644
--- a/rvs/plugins/plugin.mk.in
+++ b/rvs/plugins/plugin.mk.in
@@ -23,7 +23,8 @@ BINDIR = @BINDIR@
 TMPDIR = @TMPDIR@
 LIBDIR = @LIBDIR@
 ETCDIR = @ETCDIR@
-dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR)
+DEPDIR = @DEPDIR@
+dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR) $(DEPDIR)
 
 rvs = @rvs@
 RVS = @RVS@
@@ -42,7 +43,7 @@ shSrcFiles = $(filter %.sh,$(srcFiles))
 shOutFiles = $(patsubst $(srcdir)/%,%,$(basename $(shSrcFiles)))
 
 outFiles = $(shOutFiles)
-outBin   = $(addprefix               bin-,$(notdir $(filter bin/%,$(outFiles))))
+outBin   = $(addprefix $(BINDIR)/$(name)/,$(notdir $(filter bin/%,$(outFiles))))
 outEtc   = $(addprefix $(ETCDIR)/$(name)/,$(notdir $(filter etc/%,$(outFiles))))
 outLib   = $(addprefix $(LIBDIR)/$(name)/,$(notdir $(filter lib/%,$(outFiles))))
 
@@ -52,11 +53,9 @@ $(name) : $(myoutdir) $(shOutFiles)
 
 install : $(outBin) $(outEtc) $(outLib)
 
-unbin-% : bin/%
-	$(RVS) uninstall $(notdir $<) $(name)
-
-bin-% : bin/%
-	$(RVS) install $< $(notdir $<) $(name) $(priority)
+$(outBin) : $(BINDIR)/$(name)/% : bin/%
+	$(MKDIR) $(dir $@)
+	$(INSTALL_PROGRAM) $< $@
 
 $(outEtc) : $(ETCDIR)/$(name)/% : etc/%
 	$(MKDIR) $(dir $@)
-- 
cgit v1.2.3