Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Mattias Andrée 2012-08-23 04:25:36 +02:00
commit 36e937ea8a

3
configure vendored
View file

@ -307,9 +307,6 @@ function makeMakefile()
'| |___/ |___/ |\\n'\\
'\\\\--------------------------------------------------/'
EOF
echo -en '\t' ; echo '@echo dummy | ./ponysay.install -f ./`if [[ "$$TERM" = "linux" ]]; then echo ttyponies; else echo ponies; fi`/pinkiecannon.pony | tail --lines=30 ; echo -e \\n'
echo
echo 'uninstall:'
echo -en '\t' ; echo 'if [ -d "$/var/cache/ponysay" ]; then rm -rf "$/var/cache/ponysay"; fi'
for old in $installedDirs; do