From 7f78b595ce3baf3ade82e546a3ed7cfba41c8ef9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 28 Jul 2009 15:50:27 -0400
Subject: use the Makefile.in name used by the GNU build system

---
 Makefile.in                 | 90 +++++++++++++++++++++++++++++++++++++++++++++
 Makefile.orig               | 90 ---------------------------------------------
 configure                   |  4 +-
 plugins/repo/Makefile.in    | 79 +++++++++++++++++++++++++++++++++++++++
 plugins/repo/Makefile.orig  | 79 ---------------------------------------
 plugins/users/Makefile.in   | 79 +++++++++++++++++++++++++++++++++++++++
 plugins/users/Makefile.orig | 79 ---------------------------------------
 7 files changed, 250 insertions(+), 250 deletions(-)
 create mode 100644 Makefile.in
 delete mode 100644 Makefile.orig
 create mode 100644 plugins/repo/Makefile.in
 delete mode 100644 plugins/repo/Makefile.orig
 create mode 100644 plugins/users/Makefile.in
 delete mode 100644 plugins/users/Makefile.orig

diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..7a3e131
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,90 @@
+#!/usr/bin/make -f
+# rvs Makefile
+# version 0.7.0
+# Copyright (C) 2009 Luke Shumaker
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# 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
+
+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 : install uninstall clean distclean $(all-plugins)
+.PHONY : install uninstall clean distclean
+.SUFFIXES :
+
+# targets ##########################################################
+
+$(rvsdir)/plugins :
+	$(MKDIR) $(dir $@)
+	$(TOUCH) $@
+
+# install/clean/remove #############################################
+
+install : $(bindir)/rvs $(rvsdir)/plugins $(install-plugins)
+
+clean :
+
+distclean : clean
+	$(RM) var.sed
+	$(RM) Makefile
+
+uninstall :
+	$(RM) $(prefix)/$(bindir)/rvs
+	$(RM) -r $(rvsdir)
+
+# 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) $< $@
+
+# make plugins
+p-% : plugins/% plugins/%/Makefile $(srcdir)/plugins/%
+	$(MAKE) -C $<
+
+# install plugins
+install-p-% : plugins/% plugins/%/Makefile $(srcdir)/plugins/% p-%
+	$(MAKE) -C $< install
+
+# uninstall plugins
+uninstall-p-% : plugins/% plugins/%/Makefile
+	$(MAKE) -C $< uninstall
diff --git a/Makefile.orig b/Makefile.orig
deleted file mode 100644
index 7a3e131..0000000
--- a/Makefile.orig
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/make -f
-# rvs Makefile
-# version 0.7.0
-# Copyright (C) 2009 Luke Shumaker
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# 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
-
-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 : install uninstall clean distclean $(all-plugins)
-.PHONY : install uninstall clean distclean
-.SUFFIXES :
-
-# targets ##########################################################
-
-$(rvsdir)/plugins :
-	$(MKDIR) $(dir $@)
-	$(TOUCH) $@
-
-# install/clean/remove #############################################
-
-install : $(bindir)/rvs $(rvsdir)/plugins $(install-plugins)
-
-clean :
-
-distclean : clean
-	$(RM) var.sed
-	$(RM) Makefile
-
-uninstall :
-	$(RM) $(prefix)/$(bindir)/rvs
-	$(RM) -r $(rvsdir)
-
-# 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) $< $@
-
-# make plugins
-p-% : plugins/% plugins/%/Makefile $(srcdir)/plugins/%
-	$(MAKE) -C $<
-
-# install plugins
-install-p-% : plugins/% plugins/%/Makefile $(srcdir)/plugins/% p-%
-	$(MAKE) -C $< install
-
-# uninstall plugins
-uninstall-p-% : plugins/% plugins/%/Makefile
-	$(MAKE) -C $< uninstall
diff --git a/configure b/configure
index 1983a5f..0bcd79b 100755
--- a/configure
+++ b/configure
@@ -65,10 +65,10 @@ for var in $vars; do
 done
 
 echo "11 a# DO NOT edit this file, it has been generated by configure, and will
-11 a# be overwritten. Instead, edit the file \`Makefile.orig'" >> var.sed
+11 a# be overwritten. Instead, edit the file \`Makefile.in'" >> var.sed
 
 Makefiles=`find "${_srcdir}/" -regextype posix-extended \
--regex '(.*/)?Makefile\.orig' -type f`
+-regex '(.*/)?Makefile\.in' -type f`
 
 for orig in $Makefiles; do
 	new=${orig/%.orig/}
diff --git a/plugins/repo/Makefile.in b/plugins/repo/Makefile.in
new file mode 100644
index 0000000..32a07dd
--- /dev/null
+++ b/plugins/repo/Makefile.in
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+name = repo
+# version 0.7.0
+# Copyright (C) 2009 Luke Shumaker
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# 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
+
+SHELL ?= @SHELL@
+rvsdir ?= @rvsdir@/rvs
+srcdir ?= @srcdir@
+
+libdir = $(rvsdir)/$(name)
+reldir = plugins/$(name)
+
+mysrcdir = $(srcdir)/$(reldir)
+VPATH = $(mysrcdir)
+
+# phony targets ####################################################
+all : $(name)
+.PHONY : $(name) install uninstall clean distclean
+.SUFFIXES :
+
+# targets ##########################################################
+srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f))
+
+shSrcFiles = $(filter %.sh,$(srcFiles))
+shOutFiles = $(patsubst $(mysrcdir)/%,%,$(basename $(shSrcFiles)))
+shExeFiles = $(patsubst %,$(libdir)/%,             $(shOutFiles) )
+
+$(name) : $(shOutFiles)
+
+# (un)install ######################################################
+
+install : $(shExeFiles)
+	echo $(name) >> $(rvsdir)/plugins
+
+uninstall :
+	$(RM) -r $(libdir)
+	$(SED) -i "/^$(name)$/ d" $(rvsdir)/plugins
+
+# clean ############################################################
+
+clean :
+	$(RM) $(shOutFiles)
+
+distclean : clean
+	$(RM) Makefile
+
+# implicit rules ###################################################
+
+b := @
+# build shell scripts
+% : $(mysrcdir)/%.sh
+	$(MKDIR) $(dir $@)
+	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
+# workaround... idk why it doesn't match `lib/'
+lib/% : $(mysrcdir)/lib/%.sh
+	$(MKDIR) $(dir $@)
+	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
+
+# install
+$(libdir)/% : %
+	$(MKDIR) $(dir $@)
+	$(INSTALL_PROGRAM) $< $@
+
diff --git a/plugins/repo/Makefile.orig b/plugins/repo/Makefile.orig
deleted file mode 100644
index ea9e7a9..0000000
--- a/plugins/repo/Makefile.orig
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/make -f
-name = repo
-# version 0.7.0
-# Copyright (C) 2009 Luke Shumaker
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# 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
-
-SHELL ?= @SHELL@
-rvsdir ?= @rvsdir@/rvs
-srcdir ?= @srcdir@
-
-libdir = $(rvsdir)/$(name)
-reldir = plugins/$(name)
-
-mysrcdir = $(srcdir)/$(reldir)
-VPATH = $(mysrcdir)
-
-# phony targets ####################################################
-all : $(name)
-.PHONY : $(name) install uninstall clean distclean
-.SUFFIXES :
-
-# targets ##########################################################
-srcFiles = $(filter-out %/Makefile.orig,$(shell find $(mysrcdir)/ -type f))
-
-shSrcFiles = $(filter %.sh,$(srcFiles))
-shOutFiles = $(patsubst $(mysrcdir)/%,%,$(basename $(shSrcFiles)))
-shExeFiles = $(patsubst %,$(libdir)/%,             $(shOutFiles) )
-
-$(name) : $(shOutFiles)
-
-# (un)install ######################################################
-
-install : $(shExeFiles)
-	echo $(name) >> $(rvsdir)/plugins
-
-uninstall :
-	$(RM) -r $(libdir)
-	$(SED) -i "/^$(name)$/ d" $(rvsdir)/plugins
-
-# clean ############################################################
-
-clean :
-	$(RM) $(shOutFiles)
-
-distclean : clean
-	$(RM) Makefile
-
-# implicit rules ###################################################
-
-b := @
-# build shell scripts
-% : $(mysrcdir)/%.sh
-	$(MKDIR) $(dir $@)
-	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
-# workaround... idk why it doesn't match `lib/'
-lib/% : $(mysrcdir)/lib/%.sh
-	$(MKDIR) $(dir $@)
-	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
-
-# install
-$(libdir)/% : %
-	$(MKDIR) $(dir $@)
-	$(INSTALL_PROGRAM) $< $@
-
diff --git a/plugins/users/Makefile.in b/plugins/users/Makefile.in
new file mode 100644
index 0000000..5c97ef2
--- /dev/null
+++ b/plugins/users/Makefile.in
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+name = users
+# version 0.7.0
+# Copyright (C) 2009 Luke Shumaker
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# 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
+
+SHELL ?= @SHELL@
+rvsdir ?= @rvsdir@/rvs
+srcdir ?= @srcdir@
+
+libdir = $(rvsdir)/$(name)
+reldir = plugins/$(name)
+
+mysrcdir = $(srcdir)/$(reldir)
+VPATH = $(mysrcdir)
+
+# phony targets ####################################################
+all : $(name)
+.PHONY : $(name) install uninstall clean distclean
+.SUFFIXES :
+
+# targets ##########################################################
+srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f))
+
+shSrcFiles = $(filter %.sh,$(srcFiles))
+shOutFiles = $(patsubst $(mysrcdir)/%,%,$(basename $(shSrcFiles)))
+shExeFiles = $(patsubst %,$(libdir)/%,             $(shOutFiles) )
+
+$(name) : $(shOutFiles)
+
+# (un)install ######################################################
+
+install : $(shExeFiles)
+	echo $(name) >> $(rvsdir)/plugins
+
+uninstall :
+	$(RM) -r $(libdir)
+	$(SED) -i "/^$(name)$/ d" $(rvsdir)/plugins
+
+# clean ############################################################
+
+clean :
+	$(RM) $(shOutFiles)
+
+distclean : clean
+	$(RM) Makefile
+
+# implicit rules ###################################################
+
+b := @
+# build shell scripts
+% : $(mysrcdir)/%.sh
+	$(MKDIR) $(dir $@)
+	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
+# workaround... idk why it doesn't match `lib/'
+lib/% : $(mysrcdir)/lib/%.sh
+	$(MKDIR) $(dir $@)
+	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
+
+# install
+$(libdir)/% : %
+	$(MKDIR) $(dir $@)
+	$(INSTALL_PROGRAM) $< $@
+
diff --git a/plugins/users/Makefile.orig b/plugins/users/Makefile.orig
deleted file mode 100644
index edac4f0..0000000
--- a/plugins/users/Makefile.orig
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/make -f
-name = users
-# version 0.7.0
-# Copyright (C) 2009 Luke Shumaker
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# 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
-
-SHELL ?= @SHELL@
-rvsdir ?= @rvsdir@/rvs
-srcdir ?= @srcdir@
-
-libdir = $(rvsdir)/$(name)
-reldir = plugins/$(name)
-
-mysrcdir = $(srcdir)/$(reldir)
-VPATH = $(mysrcdir)
-
-# phony targets ####################################################
-all : $(name)
-.PHONY : $(name) install uninstall clean distclean
-.SUFFIXES :
-
-# targets ##########################################################
-srcFiles = $(filter-out %/Makefile.orig,$(shell find $(mysrcdir)/ -type f))
-
-shSrcFiles = $(filter %.sh,$(srcFiles))
-shOutFiles = $(patsubst $(mysrcdir)/%,%,$(basename $(shSrcFiles)))
-shExeFiles = $(patsubst %,$(libdir)/%,             $(shOutFiles) )
-
-$(name) : $(shOutFiles)
-
-# (un)install ######################################################
-
-install : $(shExeFiles)
-	echo $(name) >> $(rvsdir)/plugins
-
-uninstall :
-	$(RM) -r $(libdir)
-	$(SED) -i "/^$(name)$/ d" $(rvsdir)/plugins
-
-# clean ############################################################
-
-clean :
-	$(RM) $(shOutFiles)
-
-distclean : clean
-	$(RM) Makefile
-
-# implicit rules ###################################################
-
-b := @
-# build shell scripts
-% : $(mysrcdir)/%.sh
-	$(MKDIR) $(dir $@)
-	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
-# workaround... idk why it doesn't match `lib/'
-lib/% : $(mysrcdir)/lib/%.sh
-	$(MKDIR) $(dir $@)
-	$(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@
-
-# install
-$(libdir)/% : %
-	$(MKDIR) $(dir $@)
-	$(INSTALL_PROGRAM) $< $@
-
-- 
cgit v1.1-4-g5e80