I'm really not sure, these are uncommited changes, and I haven't touched it in a while.

7 files changed, 453 insertions, 28 deletions

diff --git a/main.mk.in b/main.mk.in
index b311089..2d55793 100644
--- a/main.mk.in
+++ b/main.mk.in
@@ -17,7 +17,8 @@ ver = 0.9
 #  along with this program;  see the file COPYING.
 #  If not, see <http://www.gnu.org/licenses>.
 
-export rvs  = $(name)
+rvs = $(name)
+dirs += $(libexecdir)/$(rvs)
 
 # phony targets ######################################################
 all : wrapper p-build
@@ -37,15 +38,15 @@ filelist = \
 install : install-wrapper libexec p-install
 
 # $(libexecdir)/rvs/*
-libexec : $(libexecdir)/$(rvs)/plugins
-$(libexecdir)/$(rvs)/plugins : $(libexecdir)/$(rvs)
-	$(TOUCH) $@
+libexec : $(DESTDIR)$(libexecdir)/$(rvs)/plugins
+$(DESTDIR)$(libexecdir)/$(rvs)/plugins : $(DESTDIR)$(libexecdir)/$(rvs)
+	touch $@
 
 # uninstall ##########################################################
 
 uninstall :
-	$(RM) $(bindir)/$(rvs)
-	$(RM) -r $(libexecdir)/$(rvs)
+	$(RM) $(DESTDIR)$(bindir)/$(rvs)
+	$(RM) -r $(DESTDIR)$(libexecdir)/$(rvs)
 
 # clean ##############################################################
 
@@ -70,8 +71,3 @@ $(RVS) : install-wrapper
 
 p-%   : plugins/Makefile ; $(MAKE) -C plugins $*
 
-# implicit rules #####################################################
-
-$(libexecdir)/$(rvs) :
-	$(MKDIR) $@
-
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
new file mode 100644
index 0000000..e9864b3
--- /dev/null
+++ b/plugins/Makefile.in
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+#name = Luke's Makefile
+#ver = 1.0
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
+
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
+
+# Programs ###########################################################
+SHELL = /bin/sh
+CC = gcc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+MKDIR = $(INSTALL) -d #mkdir -p
+RM = rm -f
+SED = sed
+
+include main.mk
+
+# dist ###############################################################
+d = $(name)-$(ver)
+.PHONY : dist
+dist : $(d).tar.gz
+
+$(d).tar.gz : $(d) $(addprefix $(d)/,$(filelist))
+	tar -czf $@ $<
+
+$(d) : 
+	$(INSTALL) -m 777 -d $@
+
+$(d)/% : $(srcdir)/% $(d)
+	cp $< $@
+
+# implicit rules #####################################################
+$(addprefix $(DESTDIR),$(dirs)) :
+	$(MKDIR) $@
+
+% : %.sh
+	$(SED) 's/@VER@/$(ver)/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $< $@
+
+csources = $(filter %.c,$(filelist))
+Makefiles : $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(csources:.c=.d)
+
+%Makefile %.mk : $(srcdir)/configure
+	$< @CONFIG@
+
+# This is taken straight from the GNU `make' manual.
+# That makes it GFDL, which is incompatible with the GPL
+# I claim `fair-use'
+ %.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+ifneq ($(shell ls -d $(csources:.c=.d) 2>/dev/null),)
+  include $(csources:.c=.d)
+endif
+
diff --git a/plugins/filedata/Makefile.in b/plugins/filedata/Makefile.in
new file mode 100644
index 0000000..e9864b3
--- /dev/null
+++ b/plugins/filedata/Makefile.in
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+#name = Luke's Makefile
+#ver = 1.0
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
+
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
+
+# Programs ###########################################################
+SHELL = /bin/sh
+CC = gcc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+MKDIR = $(INSTALL) -d #mkdir -p
+RM = rm -f
+SED = sed
+
+include main.mk
+
+# dist ###############################################################
+d = $(name)-$(ver)
+.PHONY : dist
+dist : $(d).tar.gz
+
+$(d).tar.gz : $(d) $(addprefix $(d)/,$(filelist))
+	tar -czf $@ $<
+
+$(d) : 
+	$(INSTALL) -m 777 -d $@
+
+$(d)/% : $(srcdir)/% $(d)
+	cp $< $@
+
+# implicit rules #####################################################
+$(addprefix $(DESTDIR),$(dirs)) :
+	$(MKDIR) $@
+
+% : %.sh
+	$(SED) 's/@VER@/$(ver)/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $< $@
+
+csources = $(filter %.c,$(filelist))
+Makefiles : $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(csources:.c=.d)
+
+%Makefile %.mk : $(srcdir)/configure
+	$< @CONFIG@
+
+# This is taken straight from the GNU `make' manual.
+# That makes it GFDL, which is incompatible with the GPL
+# I claim `fair-use'
+ %.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+ifneq ($(shell ls -d $(csources:.c=.d) 2>/dev/null),)
+  include $(csources:.c=.d)
+endif
+
diff --git a/plugins/files/Makefile.in b/plugins/files/Makefile.in
new file mode 100644
index 0000000..e9864b3
--- /dev/null
+++ b/plugins/files/Makefile.in
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+#name = Luke's Makefile
+#ver = 1.0
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
+
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
+
+# Programs ###########################################################
+SHELL = /bin/sh
+CC = gcc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+MKDIR = $(INSTALL) -d #mkdir -p
+RM = rm -f
+SED = sed
+
+include main.mk
+
+# dist ###############################################################
+d = $(name)-$(ver)
+.PHONY : dist
+dist : $(d).tar.gz
+
+$(d).tar.gz : $(d) $(addprefix $(d)/,$(filelist))
+	tar -czf $@ $<
+
+$(d) : 
+	$(INSTALL) -m 777 -d $@
+
+$(d)/% : $(srcdir)/% $(d)
+	cp $< $@
+
+# implicit rules #####################################################
+$(addprefix $(DESTDIR),$(dirs)) :
+	$(MKDIR) $@
+
+% : %.sh
+	$(SED) 's/@VER@/$(ver)/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $< $@
+
+csources = $(filter %.c,$(filelist))
+Makefiles : $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(csources:.c=.d)
+
+%Makefile %.mk : $(srcdir)/configure
+	$< @CONFIG@
+
+# This is taken straight from the GNU `make' manual.
+# That makes it GFDL, which is incompatible with the GPL
+# I claim `fair-use'
+ %.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+ifneq ($(shell ls -d $(csources:.c=.d) 2>/dev/null),)
+  include $(csources:.c=.d)
+endif
+
diff --git a/plugins/users/Makefile.in b/plugins/users/Makefile.in
new file mode 100644
index 0000000..e9864b3
--- /dev/null
+++ b/plugins/users/Makefile.in
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+#name = Luke's Makefile
+#ver = 1.0
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
+
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
+
+# Programs ###########################################################
+SHELL = /bin/sh
+CC = gcc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+MKDIR = $(INSTALL) -d #mkdir -p
+RM = rm -f
+SED = sed
+
+include main.mk
+
+# dist ###############################################################
+d = $(name)-$(ver)
+.PHONY : dist
+dist : $(d).tar.gz
+
+$(d).tar.gz : $(d) $(addprefix $(d)/,$(filelist))
+	tar -czf $@ $<
+
+$(d) : 
+	$(INSTALL) -m 777 -d $@
+
+$(d)/% : $(srcdir)/% $(d)
+	cp $< $@
+
+# implicit rules #####################################################
+$(addprefix $(DESTDIR),$(dirs)) :
+	$(MKDIR) $@
+
+% : %.sh
+	$(SED) 's/@VER@/$(ver)/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $< $@
+
+csources = $(filter %.c,$(filelist))
+Makefiles : $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(csources:.c=.d)
+
+%Makefile %.mk : $(srcdir)/configure
+	$< @CONFIG@
+
+# This is taken straight from the GNU `make' manual.
+# That makes it GFDL, which is incompatible with the GPL
+# I claim `fair-use'
+ %.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+ifneq ($(shell ls -d $(csources:.c=.d) 2>/dev/null),)
+  include $(csources:.c=.d)
+endif
+
diff --git a/wrapper/Makefile.in b/wrapper/Makefile.in
new file mode 100644
index 0000000..e9864b3
--- /dev/null
+++ b/wrapper/Makefile.in
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+#name = Luke's Makefile
+#ver = 1.0
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
+
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
+
+# Programs ###########################################################
+SHELL = /bin/sh
+CC = gcc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+MKDIR = $(INSTALL) -d #mkdir -p
+RM = rm -f
+SED = sed
+
+include main.mk
+
+# dist ###############################################################
+d = $(name)-$(ver)
+.PHONY : dist
+dist : $(d).tar.gz
+
+$(d).tar.gz : $(d) $(addprefix $(d)/,$(filelist))
+	tar -czf $@ $<
+
+$(d) : 
+	$(INSTALL) -m 777 -d $@
+
+$(d)/% : $(srcdir)/% $(d)
+	cp $< $@
+
+# implicit rules #####################################################
+$(addprefix $(DESTDIR),$(dirs)) :
+	$(MKDIR) $@
+
+% : %.sh
+	$(SED) 's/@VER@/$(ver)/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $< $@
+
+csources = $(filter %.c,$(filelist))
+Makefiles : $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(csources:.c=.d)
+
+%Makefile %.mk : $(srcdir)/configure
+	$< @CONFIG@
+
+# This is taken straight from the GNU `make' manual.
+# That makes it GFDL, which is incompatible with the GPL
+# I claim `fair-use'
+ %.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+ifneq ($(shell ls -d $(csources:.c=.d) 2>/dev/null),)
+  include $(csources:.c=.d)
+endif
+
diff --git a/wrapper/main.mk.in b/wrapper/main.mk.in
index 7d9cc19..ecc6cc6 100644
--- a/wrapper/main.mk.in
+++ b/wrapper/main.mk.in
@@ -1,25 +1,24 @@
 #!/usr/bin/make -f
 name = @name@
 ver = 0.9
-#   Copyright (C) 2009 Luke Shumaker
-#   
-#   This file is part of rvs.
-#   
-#   rvs is free software; you can redistribute it and/or modify it under the
-#   terms of the GNU General Public License as published by the Free Software
-#   Foundation; either version 2, or (at your option) any later version.
-#   
-#   rvs 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.
-#   
-#   You should have received a copy of the GNU General Public License
-#   along with rvs; see the file COPYING.
-#   If not, write to the Free Software Foundation,
-#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  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.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 rvs = @name@
+dirs += $(libexecdir)/$(rvs)
 
 CFLAGS = -g \
  -DNAME=\"$(name)\" \