fixup configurator install handling for distcheck

distcheck still doesn't succeed - there are a bunch of test files that don't
get cleaned up. moving on, but will make a ticket for it.

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([codes], [0.4.0], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/])
+AC_INIT([codes], [0.5.0], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_SYSTEM

scripts/Makefile.subdir

@@ -2,7 +2,7 @@ my_bin_scripts = scripts/codes_configurator \
 			   scripts/codes_filter_configs \
 			   scripts/codes_config_get_vals
 
-bin_SCRIPTS += $(my_bin_scripts) 
+bin_SCRIPTS += $(my_bin_scripts) scripts/_configurator.py
 EXTRA_DIST += scripts/codes_configurator.py.in \
 			  scripts/codes_filter_configs.py.in \
 			  scripts/codes_config_get_vals.py.in \
@@ -16,7 +16,7 @@ EXTRA_DIST += scripts/codes_configurator.py.in \
 CLEANFILES += $(my_bin_scripts)
 
 # manual rules for now
-do_subst = sed -e 's![@]libdir[@]!$(libdir)!g'
+do_subst = sed -e 's![@]bindir[@]!$(bindir)!g'
 
 .PHONY: scriptdir
 # need to ensure that the scripts directory exists before running the sub cmd
@@ -27,9 +27,12 @@ scriptdir:
 	$(do_subst) < $< > $@
 	chmod +x $@
 
+scripts/_configurator.py: scripts/configurator.py
+	cp $^ $@
+
 # install hook for configurator utility lib
 # TODO: actually use the install program, use more of a 'standard' approach
-install-data-local:
-	cp $(top_srcdir)/scripts/configurator.py $(libdir)
-uninstall-local:
-	rm -f $(libdir)/configurator.py
+#install-data-local:
+#install -m 644 $(top_srcdir)/scripts/configurator.py $(libdir)
+#uninstall-local:
+#rm -f $(libdir)/configurator.py

scripts/codes_config_get_vals.py.in

@@ -26,7 +26,7 @@ def import_from(fname):
     fmod, fname, data = imp.find_module(name, [path])
     return imp.load_module(name,fmod,fname,data)
 
-conf = import_from("@libdir@/configurator.py")
+conf = import_from("@bindir@/_configurator.py")
 
 def main():
     args = parse_args()

scripts/codes_configurator.py.in

@@ -21,7 +21,7 @@ def import_from(fname):
     fmod, fname, data = imp.find_module(name, [path])
     return imp.load_module(name,fmod,fname,data)
 
-conf = import_from("@libdir@/configurator.py")
+conf = import_from("@bindir@/_configurator.py")
 
 def main():
     args = parse_args()

scripts/codes_filter_configs.py.in

@@ -22,7 +22,7 @@ def import_from(fname):
     fmod, fname, data = imp.find_module(name, [path])
     return imp.load_module(name,fmod,fname,data)
 
-conf = import_from("@libdir@/configurator.py")
+conf = import_from("@bindir@/_configurator.py")
 
 def main():
     args = parse_args()