summaryrefslogtreecommitdiff
path: root/plugins/plugin.mk.in
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-06-24 23:31:22 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-06-26 00:30:20 -0600
commit2a020d78f993f6834a7482f757d524d5a95afb2f (patch)
treeb748d59242e60ea3dc8b3e1606b0bddda99ce0b5 /plugins/plugin.mk.in
parentf2112762334c10820436394aa109e71f63cf68b8 (diff)
commit changes that have been sitting there for years, being copied from drive to drive
Diffstat (limited to 'plugins/plugin.mk.in')
-rw-r--r--plugins/plugin.mk.in13
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/plugin.mk.in b/plugins/plugin.mk.in
index 250f03a..d631e4e 100644
--- a/plugins/plugin.mk.in
+++ b/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 $@)