use consistent name sfi_config, like plc_config and geni_config

diff --git a/Makefile b/Makefile
index 6c0ecce..a4377a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: $(init)
+python: index
 
 python-install:
        python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES
@@ -50,6 +50,9 @@ init := geni/__init__.py geni/util/__init__.py geni/methods/__init__.py
 force:
 .PHONY: force 
 
+index: $(init)
+.PHONY: index
+
 geni/__init__.py:
        (echo '## Please use make index to update this file' ; echo 'all = """' ; cd geni; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@
 

diff --git a/config/config_sfi b/config/sfi_config
similarity index 100%
rename from config/config_sfi
rename to config/sfi_config

diff --git a/setup.py b/setup.py
index ed2c757..8a3913a 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ import shutil
 version = '0.2'
 scripts = ['geni/gimport.py', 'geni/plc.py', 'cmdline/sfi.py', 'config/geni-config-tty']
 package_dirs = ['geni', 'geni/util', 'geni/methods']
-data_files = [('/etc/geni/', ['config/aggregates.xml', 'config/registries.xml', 'config/geni_config', 'config/config_sfi']),
+data_files = [('/etc/geni/', ['config/aggregates.xml', 'config/registries.xml', 'config/geni_config', 'config/sfi_config']),
               ('/etc/init.d/', ['geni/geniwrapper'])]
 symlinks = ['/usr/share/geniwrapper']
 initscripts = ['/etc/init.d/geniwrapper']