PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2024-11-25 13:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Mattias Andrée 2012-08-27 17:33:28 +02:00
commit 9ba9e9a264
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -12,9 +12,11 @@ function makeMakefile()
echo
echo -e 'default: all\n'
echo -e 'all: build\n'
for func in $(echo 'build' 'prebuilt' 'install' 'uninstall' 'uninstall-old' 'clean' 'clean-old' 'view'); do
echo -e "$func"':\n\t./setup.py $(PARAMS) '"$func"'\n'
for func in $(echo 'build' 'prebuilt' 'uninstall' 'uninstall-old' 'clean' 'clean-old' 'view'); do
echo -e "$func"':\n\t./setup.py ---DESTDIR="$(DESTDIR)" ---PREFIX="$(PREFIX)" $(PARAMS) '"$func"'\n'
done
echo -e 'install-build:\n\t./setup.py ---DESTDIR="$(DESTDIR)" ---PREFIX="$(PREFIX)" $(PARAMS) install\n'
echo -e 'install:\n\t./setup.py ---DESTDIR="$(DESTDIR)" ---PREFIX="$(PREFIX)" $(PARAMS) prebuilt\n'
}

3
manuals/ponysay.texinfo
View file

@ -692,6 +692,9 @@ Required to run the @command{./configure} script. (Optional)
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

17
setup.py
View file

@ -8,7 +8,7 @@ from subprocess import Popen, PIPE
PONYSAY_VERSION = '2.5'
PONYSAY_VERSION = '2.5.1'
@ -64,6 +64,8 @@ class Setup():
opts.add_argumentless(alternatives = ['--help'])
opts.add_argumentless(alternatives = ['--version'])
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'])
@ -137,6 +139,17 @@ class Setup():
self.linking = opts.opts['--linking'][0]
if (opts.opts['---DESTDIR'] is not None) and (opts.opts['--dest-dir'] is not None):
destdir = opts.opts['---DESTDIR'][0]
if len(destdir) > 0:
opts.opts['--dest-dir'] = [destdir]
if (opts.opts['---PREFIX'] is not None) and (opts.opts['--prefix'] is not None):
prefix = opts.opts['---PREFIX'][0]
if len(prefix) > 0:
opts.opts['--prefix'] = [prefix]
if (len(opts.files) > 1) or (opts.opts['--help'] is not None) or ((len(opts.files) == 1) and (opts.files[0] == 'help')):
opts.help()
elif (opts.opts['--version'] is not None) or ((len(opts.files) == 1) and (opts.files[0] == 'version')):
@ -784,7 +797,7 @@ class Setup():
destdir = opts['--dest-dir'][0]
for key in conf:
if conf[key] not in (None, False, True):
if conf.startswith('/'):
if conf[key].startswith('/'):
conf[key] = destdir + conf[key]
return conf