./configure --shell=SHELL and ./configure --without-info-install

This commit is contained in:
Mattias Andrée 2012-08-20 17:58:31 +02:00
parent aa952d266a
commit 9ef7914456
2 changed files with 45 additions and 22 deletions

18
configure vendored
View file

@ -3,6 +3,7 @@
PREFIX="/usr" PREFIX="/usr"
INFODESC=\''My Little Ponies for your terminal'\' INFODESC=\''My Little Ponies for your terminal'\'
SHELL="env 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'
@ -54,6 +55,7 @@ function getcompfile()
installPdf='' installPdf=''
installInfo=' install-info' installInfo=' install-info'
installInfoInstall=' install-info-install'
installMan=' install-man' installMan=' install-man'
installManEs='' installManEs=''
installBash=' install-bash' installBash=' install-bash'
@ -68,9 +70,12 @@ for arg in "$@"; do
PREFIX="$val" PREFIX="$val"
elif [ "$opt" = '--info-desc' ]; then elif [ "$opt" = '--info-desc' ]; then
INFODESC=\'"$(sed -e s/\'/\''\\'\'\'/g <<<"$val")"\' INFODESC=\'"$(sed -e s/\'/\''\\'\'\'/g <<<"$val")"\'
elif [ "$opt" = '--shell' ]; then
SHELL="$val"
elif [ "$opt" = '--with-pdf' ]; then installPdf=' install-pdf' elif [ "$opt" = '--with-pdf' ]; then installPdf=' install-pdf'
elif [ "$opt" = '--without-info' ]; then installInfo='' elif [ "$opt" = '--without-info' ]; then installInfo=''
elif [ "$opt" = '--without-info-install' ]; then installInfoInstall=''
elif [ "$opt" = '--without-man' ]; then installMan='' elif [ "$opt" = '--without-man' ]; then installMan=''
elif [ "$opt" = '--with-man-es' ]; then installManEs=' install-man-es' elif [ "$opt" = '--with-man-es' ]; then installManEs=' install-man-es'
elif [ "$opt" = '--without-bash' ]; then installBash='' elif [ "$opt" = '--without-bash' ]; then installBash=''
@ -80,6 +85,7 @@ for arg in "$@"; do
elif [ "$opt" = "--everything" ]; then elif [ "$opt" = "--everything" ]; then
installPdf=' install-pdf' installPdf=' install-pdf'
installInfo=' install-info' installInfo=' install-info'
installInfoInstall=' install-info-install'
installMan=' install-man' installMan=' install-man'
installManEs=' install-man-es' installManEs=' install-man-es'
installBash=' install-bash' installBash=' install-bash'
@ -91,8 +97,12 @@ for arg in "$@"; do
fi fi
done done
if [ "$installInfo" = '' ]; then
installInfoInstall=''
fi
compileMethods='core quotes manpages ponysaycompletion ponythinkcompletion' compileMethods='core quotes manpages ponysaycompletion ponythinkcompletion'
installMethods='install-min'"$installPdf$installInfo$installMan$installManEs$installBash$installFish$installZsh" installMethods='install-min'"$installPdf$installInfo$installInfoInstall$installMan$installManEs$installBash$installFish$installZsh"
if [ ! "$installInfo" = '' ]; then if [ ! "$installInfo" = '' ]; then
compileMethods="$compileMethods infomanual" compileMethods="$compileMethods infomanual"
fi fi
@ -132,9 +142,11 @@ function thinkCompletion()
echo "PREFIX = $PREFIX, edit with option --prefix=PREFIX" echo "PREFIX = $PREFIX, edit with option --prefix=PREFIX"
echo "INFODESC = $INFODESC, edit with option --info-desc=INFODESC" echo "INFODESC = $INFODESC, edit with option --info-desc=INFODESC"
echo "SHELL = $SHELL, edit with option --shell=PREFIX"
echo echo
[ ! "$installPdf" = '' ] && echo "Installing PDF manual" [ ! "$installPdf" = '' ] && echo "Installing PDF manual"
[ ! "$installInfo" = '' ] && echo "Installing info manual, add option --without-info to skip" [ ! "$installInfo" = '' ] && echo "Installing info manual, add option --without-info to skip"
[ ! "$installInfoInstall" = '' ] && echo "Installing info manual with info-install, add option --without-info to skip"
[ ! "$installMan" = '' ] && echo "Installing English manpage manual, add option --without-man to skip" [ ! "$installMan" = '' ] && echo "Installing English manpage manual, add option --without-man to skip"
[ ! "$installManEs" = '' ] && echo "Installing Spanish manpage manual" [ ! "$installManEs" = '' ] && echo "Installing Spanish manpage manual"
[ ! "$installBash" = '' ] && echo "Installing autocompletion for GNU Bash, add option --without-bash to skip" [ ! "$installBash" = '' ] && echo "Installing autocompletion for GNU Bash, add option --without-bash to skip"
@ -154,6 +166,7 @@ echo
function makeMakefile() function makeMakefile()
{ {
echo 'SHELL='\'"$SHELL"\'
echo 'PREFIX='\'"$PREFIX"\' echo 'PREFIX='\'"$PREFIX"\'
echo 'INSTALLDIR="$(DESTDIR)$(PREFIX)"' echo 'INSTALLDIR="$(DESTDIR)$(PREFIX)"'
echo 'SED_PREFIX=$$(sed -e '\''s/\//\\\//g'\'' <<<$(PREFIX))' echo 'SED_PREFIX=$$(sed -e '\''s/\//\\\//g'\'' <<<$(PREFIX))'
@ -240,6 +253,9 @@ function makeMakefile()
echo -en '\t' ; echo 'mkdir -p "$(INSTALLDIR)/share/info"' echo -en '\t' ; echo 'mkdir -p "$(INSTALLDIR)/share/info"'
echo -en '\t' ; echo 'install "ponysay.info.gz" "$(INSTALLDIR)/share/info/ponysay.info.gz"' echo -en '\t' ; echo 'install "ponysay.info.gz" "$(INSTALLDIR)/share/info/ponysay.info.gz"'
echo -en '\t' ; echo 'install "ponysay.info.gz" "$(INSTALLDIR)/share/info/ponythink.info.gz"' echo -en '\t' ; echo 'install "ponysay.info.gz" "$(INSTALLDIR)/share/info/ponythink.info.gz"'
echo
echo 'install-info-install: install-info'
echo -en '\t' ; echo 'install-info --dir-file="$(INSTALLDIR)/share/info/dir" --entry="Miscellaneous" --description='"$INFODESC"' "$(INSTALLDIR)/share/info/ponysay.info.gz"' echo -en '\t' ; echo 'install-info --dir-file="$(INSTALLDIR)/share/info/dir" --entry="Miscellaneous" --description='"$INFODESC"' "$(INSTALLDIR)/share/info/ponysay.info.gz"'
echo -en '\t' ; echo 'install-info --dir-file="$(INSTALLDIR)/share/info/dir" --entry="Miscellaneous" --description='"$INFODESC"' "$(INSTALLDIR)/share/info/ponythink.info.gz"' echo -en '\t' ; echo 'install-info --dir-file="$(INSTALLDIR)/share/info/dir" --entry="Miscellaneous" --description='"$INFODESC"' "$(INSTALLDIR)/share/info/ponythink.info.gz"'
echo echo

View file

@ -618,6 +618,7 @@ everything add the option @command{--everything} when running @command{./configu
@cindex @command{--without-man} @cindex @command{--without-man}
@cindex manpage, without @cindex manpage, without
@cindex @command{--without-info} @cindex @command{--without-info}
@cindex @command{--without-info-install}
@cindex @command{info} manual, without @cindex @command{info} manual, without
@cindex @command{--with-man-LANG} @cindex @command{--with-man-LANG}
@cindex manpage translations @cindex manpage translations
@ -629,6 +630,8 @@ running @command{./configure}. To install a manpage translation add
Currently the only translation is Spanish with the language code @code{es}. Currently the only translation is Spanish with the language code @code{es}.
If you do not want the English manpage add the option @command{--without-man}. If you do not want the English manpage add the option @command{--without-man}.
If you do not want the @command{info} manual add the option @command{--without-info}. If you do not want the @command{info} manual add the option @command{--without-info}.
If you are installing the @command{info} manual but are not privileged to execute
@command{info-install} add the option @command{--without-info-install}.
The following argumentless options are also recognised: The following argumentless options are also recognised:
@ -664,6 +667,10 @@ If you are not using @command{--without-info} you can add
@command{--info-desc=DESCRIPTION} to specify the description @command{info} @command{--info-desc=DESCRIPTION} to specify the description @command{info}
which provide when listing commands. which provide when listing commands.
@cindex @command{--shell=SHELL}
By default @command{bash} is in the make file, if you want to use another shell
add the option @command{--shell=SHELL}.
@node Arch Linux @node Arch Linux
@section Arch Linux @section Arch Linux