mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Make the setup.py proper again, allow for env var to set conf root
This commit is contained in:
parent
0f7f896520
commit
9e019dcf6c
1 changed files with 5 additions and 2 deletions
7
setup.py
7
setup.py
|
@ -16,7 +16,10 @@ mod_path = os.path.join(get_python_lib(), 'salt/modules/')
|
|||
doc_path = os.path.join(PREFIX, 'share/doc/', NAME + '-' + VER)
|
||||
example_path = os.path.join(doc_path, 'examples')
|
||||
template_path = os.path.join(example_path, 'templates')
|
||||
etc_path = os.path.join(os.path.dirname(os.path.normpath(sys.prefix)) + 'etc')
|
||||
if os.environ.has_key('SYSCONFDIR'):
|
||||
etc_path = os.environ['SYSCONFDIR']
|
||||
else:
|
||||
etc_path = os.path.join(os.path.dirname(PREFIX), 'etc')
|
||||
|
||||
setup(name=NAME,
|
||||
version=VER,
|
||||
|
@ -53,7 +56,7 @@ setup(name=NAME,
|
|||
'scripts/salt-cp',
|
||||
'scripts/salt-call',
|
||||
'scripts/salt'],
|
||||
data_files=[(os.path.join(etc_path),
|
||||
data_files=[(os.path.join(etc_path, 'salt'),
|
||||
['conf/master',
|
||||
'conf/minion',
|
||||
]),
|
||||
|
|
Loading…
Add table
Reference in a new issue