[FFmpeg-cvslog] r13638 - trunk/configure

[Ramiro Polla]

mru wrote:
> Author: mru
> Date: Tue Jun  3 01:51:36 2008
> New Revision: 13638
> 
> Log:
> improve installation path selection
> 
> 
> Modified:
>    trunk/configure
> 
> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	(original)
> +++ trunk/configure	Tue Jun  3 01:51:36 2008
> @@ -300,6 +300,12 @@ disabled_any(){
>      done
>  }
>  
> +set_default(){
> +    for opt; do
> +        eval test -z "\$$opt" && eval $opt=\$${opt}_default
> +    done
> +}
> +
>  is_in(){
>      value=$1
>      shift
> @@ -903,12 +909,12 @@ vhook_extralibs='$ldl'
>  logfile="config.err"
>  
>  # installation paths
> -prefix="/usr/local"
> -libdir='$(PREFIX)/lib'
> -shlibdir="$libdir"
> -incdir='$(PREFIX)/include'
> -mandir='$(PREFIX)/share/man'
> -bindir='$(PREFIX)/bin'
> +prefix_default="/usr/local"
> +bindir_default='${prefix}/bin'
> +incdir_default='${prefix}/include'
> +libdir_default='${prefix}/lib'
> +mandir_default='${prefix}/share/man'
> +shlibdir_default="$libdir_default"
>  
>  # toolchain
>  cc="gcc"
> @@ -1167,7 +1173,7 @@ enabled     sparc64       && enable spar
>  # OS specific
>  case $target_os in
>      beos|haiku|zeta)
> -        prefix="$HOME/config"
> +        prefix_default="$HOME/config"
>          # helps building libavcodec
>          add_cflags "-DPIC -fomit-frame-pointer"
>          # 3 gcc releases known for BeOS, each with ugly bugs
> @@ -1236,7 +1242,7 @@ case $target_os in
>              disable need_memalign
>              LIBTARGET=x64
>          fi
> -        shlibdir="$bindir"
> +        shlibdir_default="$bindir"

This gives:
SHLIBDIR=$(DESTDIR)

in config.mak