tweak makefiles

1 files changed, 53 insertions, 48 deletions

diff --git a/Makefile.in b/Makefile.in
index 7a3e131..e26131a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# rvs Makefile
+name = @name@
 # version 0.7.0
 # Copyright (C) 2009 Luke Shumaker
 # This program is distributed in the hope that it will be useful,
@@ -10,81 +10,86 @@
 # Originally written by Luke Shumaker <lukeshu@sbcglobal.net>.
 
 
-# Variables ########################################################
-RM = rm -f
-CP = cp
-SED = sed
-INSTALL = install
-MKDIR = $(INSTALL) -d #mkdir -p
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL) -m 644
-TOUCH = touch
-export RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA
-
-SHELL = @SHELL@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-rvsdir = @rvsdir@/rvs
-srcdir = @srcdir@
-export SHELL rvsdir srcdir
-
+export rvs  = $(name)
+# Directories ######################################################
+srcdir  = @srcdir@
+prefix  = @prefix@
+exec_prefix  = @exec_prefix@
+bindir  = @bindir@
+sbindir  = @sbindir@
+libexecdir  = @libexecdir@
+dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+export   srcdir    prefix    exec_prefix    bindir    sbindir    libexecdir
+
+# Programs #########################################################
+RVS  = @RVS@
+SHELL  = @SHELL@
+RM  = rm -f
+CP  = cp
+SED  = sed
+INSTALL  = install
+MKDIR  = $(INSTALL) -d #mkdir -p
+INSTALL_PROGRAM  = $(INSTALL)
+INSTALL_DATA  = $(INSTALL) -m 644
+TOUCH  = touch
+export RVS SHELL RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA TOUCH
+
+# plugin targets ###################################################
 plugins = $(patsubst $(srcdir)/plugins/%,%,\
   $(shell find $(srcdir)/plugins/* -maxdepth 0 -type d))
-
-# phony targets ####################################################
 make-plugins    = $(addprefix         p-,$(plugins))
 install-plugins = $(addprefix install-p-,$(plugins))
 remove-plugins  = $(addprefix  remove-p-,$(plugins))
 all-plugins = $(make-plugins) $(install-plugins) $(remove-plugins)
-all : rvs $(make-plugins)
+
+# phony targets ####################################################
+all : $(rvs) $(make-plugins)
 #.PHONY : install uninstall clean distclean $(all-plugins)
 .PHONY : install uninstall clean distclean
 .SUFFIXES :
 
 # targets ##########################################################
+b := @
+$(rvs) : $(srcdir)/rvs.sh
+	$(SED) \
+  -e 's/$bSHELL@/$(subst      /,\/,$(SHELL)     )/g' \
+  -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \
+  -e 's/$bname@/$(subst       /,\/,$(name)      )/g' \
+    < $< > $@
+
+$(bindir)/$(rvs) : $(rvs) $(bindir)
+	$(INSTALL_PROGRAM) $< $@
 
-$(rvsdir)/plugins :
-	$(MKDIR) $(dir $@)
+$(libexecdir)/$(rvs)/plugins : $(rvsdir)
 	$(TOUCH) $@
 
 # install/clean/remove #############################################
 
-install : $(bindir)/rvs $(rvsdir)/plugins $(install-plugins)
+install : install-$(name) $(rvsdir)/plugins $(install-plugins)
+install-$(name) : $(bindir)/$(rvs)
+
+
+uninstall :
+	$(RM) $(prefix)/$(bindir)/rvs
+	$(RM) -r $(libexecdir)/$(rvs)
 
 clean :
 
 distclean : clean
-	$(RM) var.sed
 	$(RM) Makefile
-
-uninstall :
-	$(RM) $(prefix)/$(bindir)/rvs
-	$(RM) -r $(rvsdir)
+	$(RM) $(rvs)
 
 # implicit rules ###################################################
 
-# 'build' shell scripts
-b := @
-% : $(srcdir)/%.sh
-	$(MKDIR) $(dir $@)
-	$(SED) -e 's/$bSHELL@/$(subst  /,\/,$(SHELL) )/g' \
-    -e 's/$brvsdir@/$(subst /,\/,$(rvsdir))/g' <$< > $@
-
-# install
-$(bindir)/% : %
-	$(MKDIR) $(dir $@)
-	$(INSTALL_PROGRAM) $< $@
+$(dirs) :
+	$(MKDIR) $@
 
-# make plugins
-p-% : plugins/% plugins/%/Makefile $(srcdir)/plugins/%
+# make/install/uninstall plugins
+p-% :           plugins/% plugins/%/Makefile $(srcdir)/plugins/%
 	$(MAKE) -C $<
 
-# install plugins
-install-p-% : plugins/% plugins/%/Makefile $(srcdir)/plugins/% p-%
+install-p-% :   plugins/% plugins/%/Makefile $(srcdir)/plugins/% p-%
 	$(MAKE) -C $< install
 
-# uninstall plugins
 uninstall-p-% : plugins/% plugins/%/Makefile
 	$(MAKE) -C $< uninstall