From 9c9bd21d4badad5ce0433e83c03d0f92033f27a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
Date: Sat, 1 Jun 2013 08:06:21 +0200
Subject: [PATCH] add --*dir alternatives to --*-dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 manuals/ponysay.texinfo | 28 +++++++++++++++++++++-------
 setup.py                | 14 +++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index b6040a7a..fe613823 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -2268,35 +2268,49 @@ for the current user.
 @opindex @option{--opt}
 Change all implicit directories to fit installation to @file{/opt}.
 
-@item --bin-dir=/usr/bin
+@item --bin-dir
+@itemx --bindir=/usr/bin
+@opindex @option{--bindir}
 @opindex @option{--bin-dir}
 Set the system's directory for command executables.
 
-@item --lib-dir=/usr/lib/ponysay
+@item --lib-dir
+@itemx --libdir=/usr/lib/ponysay
+@opindex @option{--libdir}
 @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
+@item --libexec-dir
+@itemx --libexecdir=/usr/libexec/ponysay
+@opindex @option{--libexecdir}
 @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.
 
-@item --share-dir=/usr/share
+@item --share-dir
+@itemx --sharedir=/usr/share
+@opindex @option{--sharedir}
 @opindex @option{--share-dir}
 Set the system's directory for resource files.
 
-@item --sysconf-dir=/etc
+@item --sysconf-dir
+@itemx --sysconfdir=/etc
+@opindex @option{--sysconfdir}
 @opindex @option{--sysconf-dir}
 Set the system's local specific configuration directory.
 
-@item --cache-dir=/var/cache
+@item --cache-dir
+@itemx --cachedir=/var/cache
+@opindex @option{--cachedir}
 @opindex @option{--cache-dir}
 Set the system's directory for cache directories.
 
-@item --dest-dir=
+@item --dest-dir
+@itemx --destdir=
+@opindex @option{--destdir}
 @opindex @option{--dest-dir}
 Set off environment for installation.
 
diff --git a/setup.py b/setup.py
index ed272dc0..8d99b38c 100755
--- a/setup.py
+++ b/setup.py
@@ -198,25 +198,25 @@ class Setup():
                               alternatives = ['--opt'])
 
         opts.add_argumented  (help = 'Set the system\'s directory for command executables\nDefault = $PREFIX/bin',
-                              alternatives = ['--bin-dir'], arg='BINDIR')
+                              alternatives = ['--bin-dir', '--bindir'], arg='BINDIR')
 
         opts.add_argumented  (help = 'Set the system\'s directory for non-executable libraries\nDefault = $PREFIX/lib/ponysay\nNot used.',
-                              alternatives = ['--lib-dir'], arg='LIBDIR')
+                              alternatives = ['--lib-dir', '--libdir'], 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='LIBEXECDIR')
+                              alternatives = ['--libexec-dir', '--libexecdir'], arg='LIBEXECDIR')
 
         opts.add_argumented  (help = 'Set the system\'s directory for resource files\nDefault = $PREFIX/share',
-                              alternatives = ['--share-dir'], arg='SHAREDIR')
+                              alternatives = ['--share-dir', '--sharedir'], arg='SHAREDIR')
 
         opts.add_argumented  (help = 'Set the system\'s local specific configuration directory\nDefault = /etc',
-                              alternatives = ['--sysconf-dir'], arg='SYSCONFDIR')
+                              alternatives = ['--sysconf-dir', '--sysconfdir'], arg='SYSCONFDIR')
 
         opts.add_argumented  (help = 'Set the system\'s directory for cache directories\nDefault = /var/cache',
-                              alternatives = ['--cache-dir'], arg='CACHEDIR')
+                              alternatives = ['--cache-dir', '--cachedir'], arg='CACHEDIR')
 
         opts.add_argumented  (help = 'Set off environment for installation\nEmpty by default',
-                              alternatives = ['--dest-dir'], arg='DESTDIR')
+                              alternatives = ['--dest-dir', '--destdir'], arg='DESTDIR')
 
         opts.add_argumented  (help = 'Set how to link identical files\nDefault = symbolic, copy and hard are also recognised',
                               alternatives = ['--linking'], arg='TYPE')