diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/main.mk.in | 10 | ||||
| -rw-r--r-- | plugins/plugin.mk.in | 30 |
2 files changed, 22 insertions, 18 deletions
diff --git a/plugins/main.mk.in b/plugins/main.mk.in index 3039c1f..01ec205 100644 --- a/plugins/main.mk.in +++ b/plugins/main.mk.in @@ -17,11 +17,11 @@ # along with this program; see the file COPYING. # If not, see <http://www.gnu.org/licenses>. -sysconfdir ?= @sysconfdir@ -BINDIR ?= @BINDIR@ -TMPDIR ?= @TMPDIR@ -LIBDIR ?= @LIBDIR@ -ETCDIR ?= @ETCDIR@ +sysconfdir = @sysconfdir@ +BINDIR = @BINDIR@ +TMPDIR = @TMPDIR@ +LIBDIR = @LIBDIR@ +ETCDIR = @ETCDIR@ dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR) mods = $(patsubst ./%,%,$(shell find ./* -maxdepth 0 -type d)) diff --git a/plugins/plugin.mk.in b/plugins/plugin.mk.in index 59b6b2d..1f1995c 100644 --- a/plugins/plugin.mk.in +++ b/plugins/plugin.mk.in @@ -18,14 +18,16 @@ include info.mk # this contains the actuall name/version for the plugin # along with this program; see the file COPYING. # If not, see <http://www.gnu.org/licenses>. -sysconfdir ?= @sysconfdir@ -BINDIR ?= @BINDIR@ -TMPDIR ?= @TMPDIR@ -LIBDIR ?= @LIBDIR@ -ETCDIR ?= @ETCDIR@ +sysconfdir = @sysconfdir@ +BINDIR = @BINDIR@ +TMPDIR = @TMPDIR@ +LIBDIR = @LIBDIR@ +ETCDIR = @ETCDIR@ dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR) -rvs = @name@ +rvs = @rvs@ +RVS = @RVS@ + id = $(name)-$(ver) # phony targets #################################################### @@ -40,9 +42,9 @@ shSrcFiles = $(filter %.sh,$(srcFiles)) shOutFiles = $(patsubst $(srcdir)/%,%,$(basename $(shSrcFiles))) outFiles = $(shOutFiles) -outBin = $(addprefix bin-,$(notdir $(filter bin/%,$(outFiles)))) -outEtc = $(addprefix $(ETCDIR)/$(name),$(notdir $(filter etc/%,$(outFiles)))) -outLib = $(addprefix $(LIBDIR)/$(name),$(notdir $(filter lib/%,$(outFiles)))) +outBin = $(addprefix bin-,$(notdir $(filter bin/%,$(outFiles)))) +outEtc = $(addprefix $(ETCDIR)/$(name)/,$(notdir $(filter etc/%,$(outFiles)))) +outLib = $(addprefix $(LIBDIR)/$(name)/,$(notdir $(filter lib/%,$(outFiles)))) $(name) : $(myoutdir) $(shOutFiles) @@ -56,11 +58,13 @@ unbin-% : bin/% bin-% : bin/% $(RVS) install $< $(notdir $<) $(name) $(priority) -$(ECTDIR)/$(name)/% : etc/% - $(CP) $< $@ +$(outEtc) : $(ETCDIR)/$(name)/% : etc/% + $(MKDIR) $(dir $@) + $(INSTALL_PROGRAM) $< $@ -$(LIBDIR)/$(name)/% : lib/% - $(CP) $< $@ +$(outLib) : $(LIBDIR)/$(name)/% : lib/% + $(MKDIR) $(dir $@) + $(INSTALL_DATA) $< $@ uninstall : $(RVS) uninstall $(name) |