make fix and support for python 2 and default python

This commit is contained in:
Mattias Andrée 2012-08-20 18:21:04 +02:00
parent 9ef7914456
commit 1f2d6a5322

14
configure vendored
View file

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PREFIX="/usr" PREFIX='/usr'
INFODESC=\''My Little Ponies for your terminal'\' INFODESC=\''My Little Ponies for your terminal'\'
SHELL="env bash" SHELL='bash'
completions='completion/bash-completion.sh completion/fish-completion.fish completion/zsh-completion.zsh' completions='completion/bash-completion.sh completion/fish-completion.fish completion/zsh-completion.zsh'
shareDirs='ponies ttyponies quotes' shareDirs='ponies ttyponies quotes'
@ -19,7 +19,7 @@ oldCompiledDirs=''
installedFiles='bin/ponysay bin/ponythink doc/ponysay.pdf share/info/ponysay.info.gz share/info/ponythink.info.gz' installedFiles='bin/ponysay bin/ponythink doc/ponysay.pdf share/info/ponysay.info.gz share/info/ponythink.info.gz'
installedDirs='share/ponysay lib/ponysay' installedDirs='share/ponysay lib/ponysay'
compiledFiles='ponysay.info ponysay.info.gz ponysay.install' compiledFiles='ponysay.info ponysay.info.gz ponysay.install ponysay.install~'
compiledDirs='quotes' compiledDirs='quotes'
for man in $manFiles; do for man in $manFiles; do
@ -178,6 +178,10 @@ function makeMakefile()
echo "core:" echo "core:"
correctPrefix 'ponysay' correctPrefix 'ponysay'
echo -en '\t' ; echo 'if (( `env python --version 2>&1 | cut -d " " -f 2 | cut -d "." -f 1` < 3 )); then \'
echo -en '\t' ; echo ' mv "ponysay.install" "ponysay.install~" ;\'
echo -en '\t' ; echo ' sed -e '\''s/bin\/env python/bin\/env python3/g'\'' < "ponysay.install~" > "ponysay.install" ;\'
echo -en '\t' ; echo 'fi'
echo echo
echo "quotes:" echo "quotes:"
@ -227,8 +231,8 @@ function makeMakefile()
done done
echo echo
echo -en '\t' ; echo 'if [ -d "/var/cache/ponysay" ]; then rm -r "/var/cache/ponysay"; fi' echo -en '\t' ; echo 'if [ -d "/var/cache/ponysay" ]; then rm -r "/var/cache/ponysay"; fi'
echo -en '\t' ; echo 'mkdir -p $(DESTDIR)/var/cache/ponysay/' echo -en '\t' ; echo 'mkdir -p "$(DESTDIR)/var/cache/ponysay/"'
echo -en '\t' ; echo 'chmod 777 $(DESTDIR)/var/cache/ponysay/' echo -en '\t' ; echo 'chmod 777 "$(DESTDIR)/var/cache/ponysay/"'
echo echo
for completion in $completions; do for completion in $completions; do