installation doc update + more installation options alternatives + m

6 files changed, 327 insertions, 114 deletions

diff --git a/README.md b/README.md
index 7e3d18d..06f4543 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ Installation on GNU/Linux (or other Unix implementations)
 ---------------------------------------------------------
 
 [Download](/erkin/ponysay/downloads) or clone the project.
-In the terminal, `cd` into the ponysay directory and `./configure && make install`.
-You make need to be super user to run `make install`, on most systems this
-can be achieved by running `sudo make install`.
+In the terminal, `cd` into the ponysay directory and `./setup.py install` or `python3 setup.py install`.
+You may need to be super user to run `./setup.py install` without `--private`, on most systems this
+can be achieved by running `sudo ./setup.py install`.
 For more information we have provided you with an extensive [manual in PDF](https://github.com/erkin/ponysay/blob/master/ponysay.pdf?raw=true).
 
 In order to use ponysay, run:
@@ -26,7 +26,7 @@ Run `info ponysay`, `man 6 ponysay` or `ponysay -h` for more information.
 A Spanish manual is available: `man -L es 6 ponysay`.
 
 #### Arch Linux
-The package is in the official repositories as `community/ponysay`.
+The package is in the official repositories as `community/ponysay`, there is also a git version named `ponysay-git` in AUR.
 
 #### Gentoo Linux
 There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`.
@@ -80,7 +80,7 @@ Dependencies
 
 ### Required runtime dependencies
 
-`coreutils`: stty in coreutils used to determine size of the terminal
+`coreutils`: `stty` in coreutils used to determine size of the terminal
 
 `python>=3`: written in python 3
 
@@ -90,8 +90,6 @@ Dependencies
 
 `texinfo`: used for building info manual (suppressable with `./configure --without-info`)
 
-`info`: used for installing info manual to info's dir file (suppressable with `./configure --without-info-install`)
-
 `python>=3`: the installation process is written in python 3
 
 Run `./dependency-test.sh` if things are not working for you.
diff --git a/dev/dist.sh b/dev/dist.sh
index d7f34ff..6fa0224 100755
--- a/dev/dist.sh
+++ b/dev/dist.sh
@@ -39,7 +39,6 @@ ttyponies()
 pdfmanual()
 {
     texi2pdf "manuals/ponysay.texinfo"
-    git add  "manuals/ponysay.texinfo" "ponysay.pdf"
     for ext in `echo aux cp cps fn ky log pg toc tp vr`; do
 	if [ -f "ponysay.$ext" ]; then
 	    unlink "ponysay.$ext"
@@ -49,6 +48,7 @@ pdfmanual()
 	rm -r "ponysay.t2d";
     fi
     pdfjam --pagecolor 249,246,240 -o "ponysay.pdf" "ponysay.pdf"
+    git add  "manuals/ponysay.texinfo" "ponysay.pdf"
 }
 
 
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index a50d862..6f530b9 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -8,7 +8,7 @@
 @documentlanguage en
 @finalout
 @c %**end of header
-@set VERSION 2.5
+@set VERSION 2.6
 
 @copying
 This manual is for ponysay
@@ -640,7 +640,7 @@ We have provided a script that should run one most, if not all shells, named
 @table @command
 @item coreutils
 @command{stty} is used to determine the size of the terminal.
-@item python>=3
+@item python>=3@footnote{Sometimes distributed as @command{python3} rather than @command{python}.}
 @command{ponysay} is written in pure Python 3.
 @end table
 
@@ -672,7 +672,7 @@ the file name) in addition to .pony-files or pony names.
 @section Package building dependencies
 
 @table @command
-@item python>=3
+@item python>=3@footnote{Sometimes distributed as @command{python3} rather than @command{python}.}
 Required to run the @file{./setup.py} file, which is also invoked from the
 make script.
 @item gzip
@@ -681,20 +681,11 @@ Used for compressing manuals. (Optional, standard)
 Used for compressing manuals. (Optional, non-standard)
 @item texinfo
 Used to compile this @command{info} manual. (Optional, standard)
-@item info
+@item info@footnote{Normally a part of @command{texinfo}.}
 Used to install this @command{info} manual with @command{install-info}.
 (Optional, standard)
-@item make
-Required to run the make script. (Optional)
-@item sh
-Required to run the @command{./configure} script. (Optional)
-@item sed
-Used in the @command{./configure} script. (Optional)
 @end table
 
-Note that @command{info} may actually be a part of @command{texinfo};
-@command{sh} should be provided another shell, such as @command{bash}.
-
 
 @node Dependencies for pony providers
 @section Dependencies for pony providers
@@ -736,6 +727,8 @@ It can be downloaded at @url{https://github.com/maandree/util-say}.
 
 @node Installations basics
 @subsection Installations basics
+@cindex @file{setup.py}
+@cindex @command{./setup.py}
 @cindex @command{make}
 @cindex basic installation
 
@@ -751,9 +744,9 @@ If you have @command{git} you can @command{clone} the project URL
 @url{https://github.com/erkin/ponysay.git}.
 
 In the terminal, @command{cd} into the ponysay directory and execute
-@command{./configure && make install}. This will install @command{ponysay} into
-@file{/usr}, normally meaning you need to run @command{make install} as root,
-e.g. by running @command{sudo make install}.
+@command{./setup.py install} or @command{python3 setup.py install}. This will install
+@command{ponysay} into @file{/usr}, normally meaning you need to run as root, e.g. by
+running @command{sudo ./setup.py install}.
 
 Now you will be to use ponysay, run: @command{ponysay "I am just the cutest pony!"},
 or if have a specific pony in your mind: @command{ponysay -f pinkie "Partay!~"}.
@@ -764,14 +757,6 @@ or if have a specific pony in your mind: @command{ponysay -f pinkie "Partay!~"}.
 in Spanish: @command{man -L es 6 ponysay}. To install the Spanish manual add the
 option @option{--with-man-es} when running @command{./configure}.
 
-@cindex @file{setup.py}
-@cindex @command{./setup.py}
-If your system does not have @command{sh}, @command{make} or @command{sed} or can
-use @command{./setup.py OPTIONS VERB} or @command{python3 setup.py OPTIONS VERB}
-(or @command{python} instead of @command{python3}) instead of
-@command{./configure OPTIONS && make VERB}. @command{./setup.py} recognised
-@command{./setup.py version} and @command{./setup.py help}, which is not supported
-by @command{make} or @command{./configure}.
 
 
 @node Custom installations
@@ -784,14 +769,12 @@ by @command{make} or @command{./configure}.
 @cindex make
 @cindex configure
 
-@command{./configure} and @command{./setup.py} and recognises the same options.
-Whether the exception for with @option{--with-everything} and
-@option{--with-nothing}, every option that starts with @option{--with-} or
-@option{--without-} exists in both variants. @option{--with-} options install
-parts of the package. @option{--without-} options skipps installation of parts
-of the packages. With the same exception, @option{--without-} options take not
-arguments and @option{--with-} optionally takes an argument, if no argument is
-provided a default argument is implied.
+With the exception for with @option{--with-everything} and @option{--with-nothing},
+every option that starts with @option{--with-} or @option{--without-} exists in both
+variants. @option{--with-} options install parts of the package. @option{--without-}
+options skips installation of parts of the packages. With the same exception,
+@option{--without-} options take not arguments and @option{--with-} optionally takes
+an argument, if no argument is provided a default argument is implied.
 
 The configuration script recognised the following options, the default values for
 options with arguments are written after the equality sign (@code{=}) in the option:
@@ -814,14 +797,20 @@ this means that the commands, xterm ponies and legal documents is installed.
 @cindex @option{--with-nothing}
 Install nothing, except legal documents, that is not explicity included.
 
-@item --with-ponysay=/usr/bin/ponysay
+@item --with-ponysay
+@itemx --with-ponysay-command=/usr/bin/ponysay
 @cindex @option{--with-ponysay}
 @cindex @option{--without-ponysay}
+@cindex @option{--with-ponysay-command}
+@cindex @option{--without-ponysay-command}
 Install the ponysay command, and set file name. (Default)
 
-@item --with-ponythink=/usr/bin/ponythink
+@item --with-ponythink
+@itemx --with-ponythink-command=/usr/bin/ponythink
 @cindex @option{--with-ponythink}
 @cindex @option{--without-ponytink}
+@cindex @option{--with-ponythink-command}
+@cindex @option{--without-ponytink-command}
 Install the ponythink command, and set file name. (Default)
 
 @item --with-shared-cache=/var/cache/ponysay
@@ -829,28 +818,38 @@ Install the ponythink command, and set file name. (Default)
 @cindex @option{--without-shared-cache}
 Install a user shared cache, this is only used by KMS ponies so far. (Default)
 
-@item --with-bash=/usr/share/bash-completion/completions/ponysay
+@item --with-bash
+@item --with-bash-completion=/usr/share/bash-completion/completions/ponysay
 @cindex @option{--with-bash}
 @cindex @option{--without-bash}
+@cindex @option{--with-bash-completion}
+@cindex @option{--without-bash-completion}
 Install auto-completion for installed commands in GNU Bash. Select the file name
 for the installed script for the ponysay command, the other commands modifies this
 file name. (Default)
 
-@item --with-fish=/usr/share/fish/completions/ponysay.fish
+@item --with-fish
+@itemx --with-fish-completion=/usr/share/fish/completions/ponysay.fish
 @cindex @option{--with-fish}
 @cindex @option{--without-fish}
+@cindex @option{--with-fish-completion}
+@cindex @option{--without-fish-completion}
 Install auto-completion for installed commands in Friendly interactive shell.
 Select the file name for the installed script for the ponysay command, the other
 commands modifies this file name. (Default)
 
-@item --with-zsh=/usr/share/zsh/site-functions/_ponysay
+@item --with-zsh
+@itemx --with-zsh-completion=/usr/share/zsh/site-functions/_ponysay
 @cindex @option{--with-zsh}
 @cindex @option{--without-zsh}
+@cindex @option{--with-zsh-completion}
+@cindex @option{--without-zsh-completion}
 Install auto-completion for installed commands in the zsh shell.
 Select the file name for the installed script for the ponysay command, the other
 commands modifies this file name. (Default)
 
-@item --with-shell=/usr/share
+@item --with-shell
+@itemx --with-shell-completion=/usr/share
 @cindex @option{--with-shell}
 @cindex @option{--without-shell}
 @cindex @option{--with-bash}
@@ -859,83 +858,198 @@ commands modifies this file name. (Default)
 @cindex @option{--without-fish}
 @cindex @option{--with-zsh}
 @cindex @option{--without-zsh}
+@cindex @option{--with-shell-completion}
+@cindex @option{--without-shell-completion}
+@cindex @option{--with-bash-completion}
+@cindex @option{--without-bash-completion}
+@cindex @option{--with-fish-completion}
+@cindex @option{--without-fish-completion}
+@cindex @option{--with-zsh-completion}
+@cindex @option{--without-zsh-completion}
 Macro for @option{--with-bash}, @option{--with-fish} and @option{--with-zsh}.
 The argument is the used share/ directory that all shells have in common.
 
-@item --with-pdf=/usr/doc
+@item --with-pdf
+@itemx --with-pdf-manual=/usr/doc
 @cindex @option{--with-pdf}
 @cindex @option{--without-pdf}
+@cindex @option{--with-pdf-manual}
+@cindex @option{--without-pdf-manual}
 Install PDF manual, and select directory for it.
 
-@item --with-pdf-compression=gz
+@item --with-pdf-compression
+@itemx --with-pdf-manual-compression=gz
 @cindex @option{--with-pdf}
+@cindex @option{--with-pdf-manual}
 @cindex @option{--with-pdf-compression}
 @cindex @option{--without-pdf-compression}
+@cindex @option{--with-pdf-manual-compression}
+@cindex @option{--without-pdf-manual-compression}
 Compress PDF manual, select compression by file name extension. This option
 does not imply @option{--with-pdf}. (Default)
 
-@item --with-info=/usr/share/info
+@item --with-info
+@itemx --with-info-manual=/usr/share/info
 @cindex @option{--with-info}
 @cindex @option{--without-info}
+@cindex @option{--with-info-manual}
+@cindex @option{--without-info-manual}
 Install @command{info} manual, and select directory for it. (Default)
 
-@item --with-info-install=My Little Ponies for your terminal
+@item --with-info-install
+@itemx --with-info-manual-install=My Little Ponies for your terminal
 @cindex @option{--with-info-install}
 @cindex @option{--without-info-install}
+@cindex @option{--with-info-manual-install}
+@cindex @option{--without-info-manual-install}
 Use @command{install-info} when installing @command{info} manual. Set the
 description for the manual. This option does not imply @option{--with-info}. (Default)
 
-@item --with-info-compression=gz
+@item --with-info-compression
+@itemx --with-info-manual-compression=gz
 @cindex @option{--with-info}
 @cindex @option{--with-info-compression}
 @cindex @option{--without-info-compression}
+@cindex @option{--with-info-manual}
+@cindex @option{--with-info-manual-compression}
+@cindex @option{--without-info-manual-compression}
 Compress @command{info} manual, select compression by file name extension.
 This option does not imply @option{--with-info}. (Default)
 
-@item --with-man-en=/usr/share/man
+@item --with-man-en
+@itemx --with-manpage-en
+@itemx --with-man-manual-en
+@itemx --with-en-man
+@itemx --with-en-manpage
+@itemx --with-en-man-manual=/usr/share/man
 @cindex @option{--with-man-en}
 @cindex @option{--without-man-en}
+@cindex @option{--with-manpage-en}
+@cindex @option{--without-manpage-en}
+@cindex @option{--with-man-manual-en}
+@cindex @option{--without-man-manual-en}
+@cindex @option{--with-en-man}
+@cindex @option{--without-en-man}
+@cindex @option{--with-en-manpage}
+@cindex @option{--without-en-manpage}
+@cindex @option{--with-en-man-manual}
+@cindex @option{--without-en-man-manual}
 Install English @command{man} manual. Set directory for @command{man} manuals.
 (Default)
 
-@item --with-man-es=/usr/share/man
+@item --with-man-es
+@itemx --with-manpage-es
+@itemx --with-man-manual-es
+@itemx --with-es-man
+@itemx --with-es-manpage
+@itemx --with-es-man-manual=/usr/share/man
 @cindex @option{--with-man-es}
 @cindex @option{--without-man-es}
+@cindex @option{--with-manpage-es}
+@cindex @option{--without-manpage-es}
+@cindex @option{--with-man-manual-es}
+@cindex @option{--without-man-manual-es}
+@cindex @option{--with-es-man}
+@cindex @option{--without-es-man}
+@cindex @option{--with-es-manpage}
+@cindex @option{--without-es-manpage}
+@cindex @option{--with-es-man-manual}
+@cindex @option{--without-es-man-manual}
 Install Spanish @command{man} manual. Set directory for @command{man} manuals.
 
 @item --with-man
+@itemx --with-manpage
+@itemx --with-man-manual
 @cindex @option{--with-man}
 @cindex @option{--without-man}
+@cindex @option{--with-manpage}
+@cindex @option{--without-manpage}
+@cindex @option{--with-man-manual}
+@cindex @option{--without-man-manual}
 Macro for all @option{--with-man-LANG}.
 
-@item --with-man-en-compression=gz
+@item --with-man-en-compression
+@itemx --with-manpage-en-compression
+@itemx --with-man-manual-en-compression
+@itemx --with-en-man-compression
+@itemx --with-en-manpage-compression
+@itemx --with-en-man-manual-compression=gz
 @cindex @option{--with-man-en-compression}
 @cindex @option{--without-man-en-compression}
+@cindex @option{--with-manpage-en-compression}
+@cindex @option{--without-manpage-en-compression}
+@cindex @option{--with-man-manual-en-compression}
+@cindex @option{--without-man-manual-en-compression}
+@cindex @option{--with-en-man-compression}
+@cindex @option{--without-en-man-compression}
+@cindex @option{--with-en-manpage-compression}
+@cindex @option{--without-en-manpage-compression}
+@cindex @option{--with-en-man-manual-compression}
+@cindex @option{--without-en-man-manual-compression}
 Compress English @command{man} manual, select compression by file name extension.
 This option does not imply @option{--with-man-en}. (Default)
 
-@item --with-man-es-compression=gz
+@item --with-man-es-compression
+@itemx --with-manpage-es-compression
+@itemx --with-man-manual-es-compression
+@itemx --with-es-man-compression
+@itemx --with-es-manpage-compression
+@itemx --with-es-man-manual-compression=gz
 @cindex @option{--with-man-es-compression}
 @cindex @option{--without-man-es-compression}
+@cindex @option{--with-manpage-es-compression}
+@cindex @option{--without-manpage-es-compression}
+@cindex @option{--with-man-manual-es-compression}
+@cindex @option{--without-man-manual-es-compression}
+@cindex @option{--with-es-man-compression}
+@cindex @option{--without-es-man-compression}
+@cindex @option{--with-es-manpage-compression}
+@cindex @option{--without-es-manpage-compression}
+@cindex @option{--with-es-man-manual-compression}
+@cindex @option{--without-es-man-manual-compression}
 Compress Spanish @command{man} manual, select compression by file name extension.
 This option does not imply @option{--with-man-es}. (Default)
 
 @item --with-man-compression
+@itemx --with-manpage-compression
+@itemx --with-man-manual-compression
 @cindex @option{--with-man-compression}
 @cindex @option{--without-man-compression}
+@cindex @option{--with-manpage-compression}
+@cindex @option{--without-manpage-compression}
+@cindex @option{--with-man-manual-compression}
+@cindex @option{--without-man-manual-compression}
 Macro for all @option{--with-man-LANG-compression}.
 
-@item --man-section-ponysay=6
+@item --man-section-ponysay
+@itemx --man-sectionpage-ponysay
+@itemx --ponysay-man-section
+@itemx --ponysay-manpage-section=6
 @cindex @option{--man-section-ponysay}
-Change the section for the ponysay manpage.
-
-@item --man-section-cowsay=1
+@cindex @option{--manpage-section-ponysay}
+@cindex @option{--ponysay-man-section}
+@cindex @option{--ponysay-manpage-section}
+Change the section for the @command{ponysay} manpage.
+
+@item --man-section-cowsay
+@itemx --manpage-section-cowsay
+@itemx --cowsay-man-section
+@itemx --cowsay-manpage-section=1
 @cindex @option{--man-section-cowsay}
-Change the section for the cowsay manpage.
-
-@item --man-section-fortune=6
+@cindex @option{--manpage-section-cowsay}
+@cindex @option{--cowsay-man-section}
+@cindex @option{--cowsay-manpage-section}
+Change the section for the @command{cowsay} manpage.
+
+@item --man-section-fortune
+@itemx --manpage-section-fortune
+@itemx --fortune-man-section
+@itemx --fortune-manpage-section=6
 @cindex @option{--man-section-fortune}
-Change the section for the fortune manpage.
+@cindex @option{--manpage-section-fortune}
+@cindex @option{--fortune-man-section}
+@cindex @option{--fortune-manpage-section}
+Change the section for the @command{fortune} manpage.
 
 @item --with-ponies=/usr/share/ponysay/ponies
 @cindex @option{--with-ponies}
@@ -967,9 +1081,12 @@ Install pony quotes, and select installation directory for them. (Default)
 @cindex @option{--without-balloons}
 Install balloon styles, and select installation directory for them. (Default)
 
-@item --with-ucs=/usr/share/ponysay/ucsmap
+@item --with-ucs
+@itemx --with-ucs-names=/usr/share/ponysay/ucsmap
 @cindex @option{--with-ucs}
 @cindex @option{--without-ucs}
+@cindex @option{--with-ucs-names}
+@cindex @option{--without-ucs-names}
 Install UCS pony names, and select installation file name for the map. (Default)
 
 @item --without-custom-env-python
diff --git a/manuals/ponysay_front.xcf b/manuals/ponysay_front.xcf
index bbc7eed..a2ea121 100644
--- a/manuals/ponysay_front.xcf
+++ b/manuals/ponysay_front.xcf
diff --git a/ponysay.pdf b/ponysay.pdf
index 5778b6f..b8603ef 100644
--- a/ponysay.pdf
+++ b/ponysay.pdf
diff --git a/setup.py b/setup.py
index d99e5c4..b95ea76 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from subprocess import Popen, PIPE
 
 
 
-PONYSAY_VERSION = '2.5.1'
+PONYSAY_VERSION = '2.6'
 
 
 
@@ -67,68 +67,166 @@ class Setup():
         opts.add_argumented  (alternatives = ['---DESTDIR'], arg="DESTDIR")
         opts.add_argumented  (alternatives = ['---PREFIX'], arg="PREFIX")
         
-        opts.add_argumentless(help = 'Install everything that is not explicity excluded',                              alternatives = ['--everything', '--with-everything'])
-        opts.add_argumentless(help = 'Install only the essentials\nNote that this can vary depending on version',      alternatives = ['--minimal'])
-        opts.add_argumentless(help = 'Install nothing (except legal documents) that is not explicity included',        alternatives = ['--nothing', '--with-nothing'])
+        
+        opts.add_argumentless(help = 'Install everything that is not explicity excluded',
+                              alternatives = ['--everything', '--with-everything'])
+        
+        opts.add_argumentless(help = 'Install only the essentials\nNote that this can vary depending on version',
+                              alternatives = ['--minimal'])
+        
+        opts.add_argumentless(help = 'Install nothing (except legal documents) that is not explicity included',
+                              alternatives = ['--nothing', '--with-nothing'])
+        
         
         for command in commands:
-            opts.add_argumentless(help = 'Do not install the %s command' % (command),                                              alternatives = ['--without-' + command])
-            opts.add_argumented  (help = 'Install the %s command, and set file name\nDefualt = /usr/bin/%s' % (command, command),  alternatives = ['--with-' + command], arg='EXEC')
+            opts.add_argumentless(help = 'Do not install the %s command' % (command),
+                                  alternatives = ['--without-' + command, '--without-' + command + '-command'])
+            
+            opts.add_argumented  (help = 'Install the %s command, and set file name\nDefualt = /usr/bin/%s' % (command, command),
+                                  alternatives = ['--with-' + command, '--with-' + command + '-command'], arg='EXEC')
+        
+        
+        opts.add_argumentless(help = 'Do not install a user shared cache',
+                              alternatives = ['--without-shared-cache'])
+        
+        opts.add_argumented  (help = 'Install a user shared cache at CACHEDIR\nDefault = /var/cache/ponysay',
+                              alternatives = [   '--with-shared-cache'], arg='CACHEDIR')
         
-        opts.add_argumentless(help = 'Do not install a user shared cache',                                             alternatives = ['--without-shared-cache'])
-        opts.add_argumented  (help = 'Install a user shared cache at CACHEDIR\nDefault = /var/cache/ponysay',          alternatives = [   '--with-shared-cache'], arg='CACHEDIR')
         
         for shell in shells:
-            opts.add_argumentless(help = 'Do not install completion for ' + shell[2],                           alternatives = ['--without-' + shell[0]])
-            opts.add_argumented  (help = 'Set file name for the completion for ponysay in' + shell[2],          alternatives = [   '--with-' + shell[0]], arg='PONYSAY_%s_FILE' % (shell[0].upper()))
-        opts.add_argumentless(help = 'Only install explicitly included shell completions',                             alternatives = ['--without-shell'])
-        opts.add_argumented  (help = 'Set share/ directory used for shell completions\nDefault = $SHAREDIR',           alternatives = [   '--with-shell'], arg='SHAREDIR')
-        
-        opts.add_argumentless(help = 'Do not install PDF manual\nDefault',                                             alternatives = ['--without-pdf'])
-        opts.add_argumented  (help = 'Set directory for PDF manual\nDefault = $PREFIX/doc',                            alternatives = [   '--with-pdf'], arg='DOCDIR')
-        opts.add_argumentless(help = 'Do not compress PDF manual\nDefault',                                            alternatives = ['--without-pdf-compression'])
-        opts.add_argumented  (help = 'Select compression for PDF manual\nDefault = gz, xz is also recognised',         alternatives = [   '--with-pdf-compression'], arg='COMPRESSION')
-        opts.add_argumentless(help = 'Do not install info manual',                                                     alternatives = ['--without-info'])
-        opts.add_argumented  (help = 'Set directory for info manual\nDefault = $SHARE/info',                           alternatives = [   '--with-info'], arg='INFODIR')
-        opts.add_argumentless(help = 'Do not use install-info when installing info manual',                            alternatives = ['--without-info-install'])
-        opts.add_argumented  (help = 'Use install-info when installing info manual, and set description\nDefault',     alternatives = [   '--with-info-install'], arg='DESCRIPTION')
-        opts.add_argumentless(help = 'Do not compress info manual',                                                    alternatives = ['--without-info-compression'])
-        opts.add_argumented  (help = 'Select compression for info manual\nDefault = gz, xz is also recognised',        alternatives = [   '--with-info-compression'], arg='COMPRESSION')
+            opts.add_argumentless(help = 'Do not install completion for ' + shell[2],
+                                  alternatives = ['--without-' + shell[0], '--without-' + shell[0] + '-completion'])
+            
+            opts.add_argumented  (help = 'Set file name for the completion for ponysay in' + shell[2],
+                                  alternatives = ['--with-' + shell[0], '--with-' + shell[0] + '-completion'], arg='PONYSAY_%s_FILE' % (shell[0].upper()))
+        
+        
+        opts.add_argumentless(help = 'Only install explicitly included shell completions',
+                              alternatives = ['--without-shell' + '--without-shell-completion'])
+        
+        opts.add_argumented  (help = 'Set share/ directory used for shell completions\nDefault = $SHAREDIR',
+                              alternatives = ['--with-shell', '--with-shell-completion'], arg='SHAREDIR')
+        
+        
+        opts.add_argumentless(help = 'Do not install PDF manual\nDefault',
+                              alternatives = ['--without-pdf', '--without-pdf-manual'])
+        
+        opts.add_argumented  (help = 'Set directory for PDF manual\nDefault = $PREFIX/doc',
+                              alternatives = ['--with-pdf', '--with-pdf-manual'], arg='DOCDIR')
+        
+        opts.add_argumentless(help = 'Do not compress PDF manual\nDefault',
+                              alternatives = ['--without-pdf-compression', '--without-pdf-manual-compression'])
+        
+        opts.add_argumented  (help = 'Select compression for PDF manual\nDefault = gz, xz is also recognised',
+                              alternatives = ['--with-pdf-compression', '--with-pdf-manual-compression'], arg='COMPRESSION')
+        
+        opts.add_argumentless(help = 'Do not install info manual',
+                              alternatives = ['--without-info', '--without-info-manual'])
+        
+        opts.add_argumented  (help = 'Set directory for info manual\nDefault = $SHARE/info',
+                              alternatives = ['--with-info', '--with-info-manual'], arg='INFODIR')
+        
+        opts.add_argumentless(help = 'Do not use install-info when installing info manual',
+                              alternatives = ['--without-info-install', '--without-info-manual-install'])
+        
+        opts.add_argumented  (help = 'Use install-info when installing info manual, and set description\nDefault',
+                              alternatives = ['--with-info-install', '--with-info-manual-install'], arg='DESCRIPTION')
+        
+        opts.add_argumentless(help = 'Do not compress info manual',
+                              alternatives = ['--without-info-compression', '--without-info-manual-compression'])
+        
+        opts.add_argumented  (help = 'Select compression for info manual\nDefault = gz, xz is also recognised',
+                              alternatives = ['--with-info-compression', '--with-info-manual-compression'], arg='COMPRESSION')
+        
         
         for man in manpages:
-            opts.add_argumentless(help = 'Do not install %s manpage manual' % (man[1]),                                alternatives = ['--without-man-' + man[0]])
-            opts.add_argumented  (help = 'Set directory for %s manpage\nDefault = $SHARE/man' % (man[1]),              alternatives = [   '--with-man-' + man[0]], arg='MANDIR')
-        opts.add_argumentless(help = 'Do not install any manpages',                                                    alternatives = ['--without-man'])
-        opts.add_argumented  (help = 'Set directory for all man pages\nDefault = $SHARE/man',                          alternatives = [   '--with-man'], arg='MANDIR')
+            opts.add_argumentless(help = 'Do not install %s manpage manual' % (man[1]),
+                                  alternatives = ['--without-man-%s' % (man[0]), '--without-manpage-%s' % (man[0]), '--without-man-manual-%s' % (man[0]),
+                                                  '--without-%s-man' % (man[0]), '--without-%s-manpage' % (man[0]), '--without-%s-man-manual' % (man[0])])
+            
+            opts.add_argumented  (help = 'Set directory for %s manpage\nDefault = $SHARE/man' % (man[1]),
+                                  alternatives = ['--with-man-%s' % (man[0]), '--with-manpage-%s' % (man[0]), '--with-man-manual-%s' % (man[0]),
+                                                  '--with-%s-man' % (man[0]), '--with-%s-manpage' % (man[0]), '--with-%s-man-manual' % (man[0])], arg='MANDIR')
+        
+        
+        opts.add_argumentless(help = 'Do not install any manpages',
+                              alternatives = ['--without-man', '--without-manpage', '--without-man-manual'])
+        
+        opts.add_argumented  (help = 'Set directory for all man pages\nDefault = $SHARE/man',
+                              alternatives = ['--with-man', '--with-manpage', '--with-man-manual'], arg='MANDIR')
+        
         for man in manpages:
-            opts.add_argumentless(help = 'Do not compress %s manpage' % (man[1]),                                      alternatives = ['--without-man-%s-compression' % (man[0])])
+            opts.add_argumentless(help = 'Do not compress %s manpage' % (man[1]),
+                                  alternatives = ['--without-man-%s-compression' % (man[0]), '--without-manpage-%s-compression' % (man[0]), '--without-man-manual-%s-compression' % (man[0]),
+                                                  '--without-%s-man-compression' % (man[0]), '--without-%s-manpage-compression' % (man[0]), '--without-%s-man-manual-compression' % (man[0])])
+            
             opts.add_argumented  (help = 'Select compression for %s manpage\nDefault = gz, xz is also recognised' % (man[1]),
-                                                                                                                     alternatives = [   '--with-man-%s-compression' % (man[0])], arg='COMPRESSION')
-        opts.add_argumentless(help = 'Do not compress any installed manpage',                                          alternatives = ['--without-man-compression'])
-        opts.add_argumented  (help = 'Select compression for installed manpages\nDefault = gz, xz is also recognised', alternatives = [   '--with-man-compression'], arg='COMPRESSION')
+                                  alternatives = ['--with-man-%s-compression' % (man[0]), '--with-manpage-%s-compression' % (man[0]), '--with-man-manual-%s-compression' % (man[0]),
+                                                  '--with-%s-man-compression' % (man[0]), '--with-%s-manpage-compression' % (man[0]), '--with-%s-man-manual-compression' % (man[0])],
+                                  arg='COMPRESSION')
+        
+        opts.add_argumentless(help = 'Do not compress any installed manpage',
+                              alternatives = ['--without-man-compression', '--without-manpage-compression', '--without-man-manual-compression'])
+        
+        opts.add_argumented  (help = 'Select compression for installed manpages\nDefault = gz, xz is also recognised',
+                              alternatives = ['--with-man-compression', '--with-manpage-compression', '--with-man-manual-compression'], arg='COMPRESSION')
         
         for man in mansections:
-            opts.add_argumented  (help = 'Change the section for the %s manpage\nDefault = %s' % man,                  alternatives = ['--man-section-' + man[0]], arg='SECTION')
+            opts.add_argumented  (help = 'Change the section for the %s manpage\nDefault = %s' % man,
+                                  alternatives = ['--man-section-%s' % (man[0]), '--%s-manpage-section' % (man[0]),
+                                                  '--man-section-%s' % (man[0]), '--%s-manpage-section' % (man[0])], arg='SECTION')
+        
         
         for dir in sharedirs:
-            opts.add_argumentless(help = 'Do not install ' + dir[0],                                                   alternatives = ['--without-' + dir[0]])
-            opts.add_argumented  (help = 'Set directory for %s\nDefault = $SHAREDIR/ponysay/%s' % (dir[1], dir[0]),    alternatives = [   '--with-' + dir[0]], arg=dir[2])
-        opts.add_argumentless(help = 'Do not install UCS pony name map',                                               alternatives = ['--without-ucs'])
-        opts.add_argumented  (help = 'Set file for the UCS pony name map\nDefault = $SHAREDIR/ponysay/ucsmap',         alternatives = [   '--with-ucs'], arg='UCSFILE')
-        
-        opts.add_argumentless(help = 'Let the installer set the env name for python in ponysay\nDefault',                                 alternatives = ['--without-custom-env-python'])
-        opts.add_argumented  (help = 'Set the env name for python in ponysay',                                                            alternatives = ['--with-custom-env-python'], arg='PYTHON')
-        opts.add_argumented  (help = 'Set a prefix to all implicit directories\nDefault = /usr',                                          alternatives = ['--prefix'], arg='PREFIX')
-        opts.add_argumentless(help = 'Change all implicit configurations to fit local user a installation for the current user',          alternatives = ['--private'])
-        opts.add_argumentless(help = 'Change all implicit directories to fit installation to /opt',                                       alternatives = ['--opt'])
-        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.', alternatives = ['--lib-dir'], arg='LIBDIR')
-        opts.add_argumented  (help = 'Set the system\'s directory for resource files\nDefault = $PREFIX/share',                           alternatives = ['--share-dir'], arg='SHAREDIR')
-        opts.add_argumented  (help = 'Set the system\'s directory for cache directories\nDefault = /var/cache',                           alternatives = ['--cache-dir'], arg='CACHEDIR')
-        
-        opts.add_argumented  (help = 'Set off environment for installation\nEmpty by default',                                            alternatives = ['--dest-dir'], arg='DESTDIR')
-        
-        opts.add_argumented  (help = 'Set how to link identical files\nDefault = symbolic, copy and hard are also recognised',            alternatives = ['--linking'], arg='TYPE')
+            opts.add_argumentless(help = 'Do not install ' + dir[0],
+                                  alternatives = ['--without-' + dir[0]])
+            
+            opts.add_argumented  (help = 'Set directory for %s\nDefault = $SHAREDIR/ponysay/%s' % (dir[1], dir[0]),
+                                  alternatives = [   '--with-' + dir[0]], arg=dir[2])
+        
+        opts.add_argumentless(help = 'Do not install UCS pony name map',
+                              alternatives = ['--without-ucs', '--without-ucs-names'])
+        
+        opts.add_argumented  (help = 'Set file for the UCS pony name map\nDefault = $SHAREDIR/ponysay/ucsmap',
+                              alternatives = ['--with-ucs', '--with-ucs-names'], arg='UCSFILE')
+        
+        
+        opts.add_argumentless(help = 'Let the installer set the env name for python in ponysay\nDefault',
+                              alternatives = ['--without-custom-env-python'])
+        
+        opts.add_argumented  (help = 'Set the env name for python in ponysay',
+                              alternatives = ['--with-custom-env-python'], arg='PYTHON')
+        
+        
+        opts.add_argumented  (help = 'Set a prefix to all implicit directories\nDefault = /usr',
+                              alternatives = ['--prefix'], arg='PREFIX')
+        
+        opts.add_argumentless(help = 'Change all implicit configurations to fit local user a installation for the current user',
+                              alternatives = ['--private'])
+        
+        opts.add_argumentless(help = 'Change all implicit directories to fit installation to /opt',
+                              alternatives = ['--opt'])
+        
+        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.',
+                              alternatives = ['--lib-dir'], arg='LIBDIR')
+        
+        opts.add_argumented  (help = 'Set the system\'s directory for resource files\nDefault = $PREFIX/share',
+                              alternatives = ['--share-dir'], arg='SHAREDIR')
+        
+        opts.add_argumented  (help = 'Set the system\'s directory for cache directories\nDefault = /var/cache',
+                              alternatives = ['--cache-dir'], arg='CACHEDIR')
+        
+        
+        opts.add_argumented  (help = 'Set off environment for installation\nEmpty by default',
+                              alternatives = ['--dest-dir'], arg='DESTDIR')
+        
+        
+        opts.add_argumented  (help = 'Set how to link identical files\nDefault = symbolic, copy and hard are also recognised',
+                              alternatives = ['--linking'], arg='TYPE')
+        
         
         
         opts.parse()