RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   25-Jun-2007 09:58:48
  Branch: HEAD                             Handle: 2007062508584800

  Modified files:
    rpm                     configure.ac

  Log:
    move the varprefix fiddling to the area where paths are already
    manipulated

  Summary:
    Revision    Changes     Path
    2.129       +12 -15     rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.128 -r2.129 configure.ac
  --- rpm/configure.ac	25 Jun 2007 07:56:53 -0000	2.128
  +++ rpm/configure.ac	25 Jun 2007 07:58:48 -0000	2.129
  @@ -978,21 +978,6 @@
   AC_MSG_RESULT($ROOT_GROUP)
   AC_SUBST(ROOT_GROUP)
   
  -if test "x$varprefix" = "x"; then
  -    # For /usr and /usr/local, we want the 'var' directory to go
  -    # in /var and /var/local respectively. For everything else, 
  -    # just put the 'var' directory in prefix/var.
  -    case $prefix in
  -	/usr | /usr/local )
  -	    varprefix=`echo $prefix | sed 's/usr/var/'` ;;
  -	NONE)
  - 	    varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` ;;
  -	*) 
  -	    varprefix=$prefix/var ;;
  -    esac	
  -fi
  -AC_SUBST(varprefix)
  -
   dnl # provide platform-specific "find-provides" and "find-requires" script symlinks
   if echo "$build_os" | grep '.*-gnulibc1' > /dev/null ; then
   	build_os=`echo "${build_os}" | sed 's/-gnulibc1$//'`
  @@ -1081,6 +1066,18 @@
   AC_SUBST(RPMCANONVENDOR)
   AC_SUBST(RPMCANONOS)
   
  +if test "x$varprefix" = "x"; then
  +    # For /usr and /usr/local, we want the 'var' directory to go
  +    # in /var and /var/local respectively. For everything else, 
  +    # just put the 'var' directory in prefix/var.
  +    case $prefix in
  +	/usr | /usr/local ) varprefix=`echo $prefix | sed 's/usr/var/'` ;;
  +	NONE              ) varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` ;;
  +	*                 ) varprefix=$prefix/var ;;
  +    esac	
  +fi
  +AC_SUBST(varprefix)
  +
   if test X"$prefix" = XNONE ; then
       usrprefix="$ac_default_prefix"
   else
  @@ .