From 24e77f63ae243c33e1d38792080eaec1db43f8f7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 11 Aug 2009 01:14:29 -0400 Subject: I don't think this will run, but I think the next step is to turn `rvs.sh' into `rvs.c', so I'm going to go ahead and commit this. --- plugins/users/Makefile.in | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'plugins/users/Makefile.in') diff --git a/plugins/users/Makefile.in b/plugins/users/Makefile.in index b97720b..5de6cb3 100644 --- a/plugins/users/Makefile.in +++ b/plugins/users/Makefile.in @@ -20,16 +20,17 @@ ver = 0.7beta # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. export rvs ?= @name@ -# Directories ###################################################### +# directories ###################################################### srcdir ?= @srcdir@ prefix ?= @prefix@ exec_prefix ?= @exec_prefix@ bindir ?= @bindir@ sbindir ?= @sbindir@ libexecdir ?= @libexecdir@ -#export srcdir prefix exec_prefix bindir sbindir libexecdir +dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)/ +#export srcdir prefix exec_prefix bindir sbindir libexecdir -# Programs ######################################################### +# programs ######################################################### RVS ?= @RVS@ SHELL ?= @SHELL@ RM ?= rm @@ -44,10 +45,10 @@ TOUCH ?= touch # This file doesn't use touch # phony targets #################################################### all : $(name) -.PHONY : $(name) install uninstall clean distclean +.PHONY : $(name) install uninstall clean distclean dist .SUFFIXES : -# main ############################################################# +# build ############################################################ mysrcdir = $(srcdir)/plugins/$(name) myoutdir = out @@ -56,7 +57,10 @@ srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f)) shSrcFiles = $(filter %.sh,$(srcFiles)) shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles))) -$(name) : $(shOutFiles) +$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf + +$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf + $(INSTALL_DATA) $< $@ # (un)install ###################################################### @@ -90,13 +94,10 @@ $(d) : distclean b := @ # build shell scripts -$(myoutdir)/% : $(mysrcdir)/%.sh - $(MKDIR) $(dir $@) - $(INSTALL_PROGRAM) $< $@ - $(SED) -i 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' $@ -# workaround... idk why it doesn't match `lib/' -$(myoutdir)/lib/% : $(mysrcdir)/lib/%.sh - $(MKDIR) $(dir $@) +$(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir) $(INSTALL_PROGRAM) $< $@ $(SED) -i 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' $@ +$(dirs) $(libexecdir)/$(rvs) $(myoutdir) : + $(MKDIR) $@ + -- cgit v1.2.3-2-g168b