jaseg/ponysay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename setup (foreward compatiblity) option --lib-dir to --libexec-dir and add proper --lib-dir

Browse source
This commit is contained in:
Mattias Andrée 2012-09-29 23:08:13 +02:00
parent 04aae4a3aa
commit 8231dbe8f6
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
setup.py
View file

@ -210,9 +210,12 @@ class Setup():
opts.add_argumented (help = 'Set the system\'s directory for command executables\nDefault = $PREFIX/bin',
alternatives = ['--bin-dir'], arg='BINDIR')
opts.add_argumented (help = 'Set the system\'s directory for non-command executables\nDefault = $PREFIX/lib/ponysay\nNot used.',
opts.add_argumented (help = 'Set the system\'s directory for non-executable libraries\nDefault = $PREFIX/lib/ponysay\nNot used.',
alternatives = ['--lib-dir'], arg='LIBDIR')
opts.add_argumented (help = 'Set the system\'s directory for non-command executables\nDefault = $PREFIX/libexec/ponysay\nNot used.',
alternatives = ['--libexec-dir'], arg='LIBDIR')
opts.add_argumented (help = 'Set the system\'s directory for resource files\nDefault = $PREFIX/share',
alternatives = ['--share-dir'], arg='SHAREDIR')
@ -841,6 +844,7 @@ class Setup():
if opts['--opt'] is not None:
if opts['--bin-dir'] is None: opts['--bin-dir'] = ['/opt/ponysay/bin']
if opts['--lib-dir'] is None: opts['--lib-dir'] = ['/opt/ponysay/lib']
if opts['--libexec-dir'] is None: opts['--libexec-dir'] = ['/opt/ponysay/libexec']
if opts['--share-dir'] is None: opts['--share-dir'] = ['/usr/share']
if opts['--with-shared-cache'] is None: opts['--with-shared-cache'] = ['/var/opt/ponysay/cache']
for sharedir in sharedirs:
@ -848,7 +852,7 @@ class Setup():
for sharefile in sharefiles:
conf[sharefile[0]] = '/opt/ponysay/share/' + sharefile[1]
for dir in ['bin', 'lib', 'share']:
for dir in ['bin', 'lib', 'libexec', 'share']:
if opts['--' + dir + '-dir'] is not None:
d = opts['--' + dir + '-dir'][0]
if dir == 'lib':