rename setup (foreward compatiblity) option --lib-dir to --libexec-di…

…r and add proper --lib-dir

manuals/ponysay.texinfo

@@ -1133,6 +1133,12 @@ Set the system's directory for command executables.
 @item --lib-dir=/usr/lib/ponysay
 @opindex @option{--lib-dir}
 Set the system's directory for non-command executables. Currently their
+is not non-executable library, so this options has no effect, but bleeding
+edge distributors should specify it if it differs from prefered.
+
+@item --libexec-dir=/usr/libexec/ponysay
+@opindex @option{--libexec-dir}
+Set the system's directory for non-command executables. Currently their
 is not non-command executables, so this options has no effect, but bleeding
 edge distributors should specify it if it differs from prefered.
 

setup.py

@@ -210,9 +210,12 @@ def __init__(self):
         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,14 +844,15 @@ def configure(self, opts):
         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:
                 conf[sharedir[0]] = '/opt/ponysay/share/' + sharedir[0]
             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':