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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   16-Jan-2008 02:18:38
  Branch: HEAD                             Handle: 2008011601183701

  Modified files:
    rpm                     CHANGES configure.ac
    rpm/perl                Makefile.PL.in

  Log:
    make perl install directory overriddable

  Summary:
    Revision    Changes     Path
    1.2072      +1  -0      rpm/CHANGES
    2.275       +9  -0      rpm/configure.ac
    1.18        +1  -0      rpm/perl/Makefile.PL.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2071 -r1.2072 CHANGES
  --- rpm/CHANGES	15 Jan 2008 23:39:12 -0000	1.2071
  +++ rpm/CHANGES	16 Jan 2008 01:18:37 -0000	1.2072
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - proyvind: make perl install directory overriddable from configure as an argument (--with-perl=vendor/site)
       - proyvind: fix install location of man pages for perl bindings
       - proyvind: fix install location of pkgconfig & python bindings (lib64 fix)
       - jbj: don't follow symlinks using chown/chgrp from --setugids pipe.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.274 -r2.275 configure.ac
  --- rpm/configure.ac	15 Jan 2008 18:37:07 -0000	2.274
  +++ rpm/configure.ac	16 Jan 2008 01:18:37 -0000	2.275
  @@ -779,6 +779,15 @@
   WITH_PERL_SUBPACKAGE=0
   AC_ARG_WITH(perl, AS_HELP_STRING([--with-perl], [build with RPM Perl language bindings]), [
       if test ".$withval" != .no; then
  +	    PERL_INSTALLDIRS=""
  +	    if test "$withval" == "vendor"; then
  +		    PERL_INSTALLDIRS="'INSTALLDIRS'	=> 'vendor',"
  +	    fi
  +	    if test "$withval" == "site"; then
  +		    PERL_INSTALLDIRS="'INSTALLDIRS'     => 'site',"
  +	    fi
  +	    AC_DEFINE_UNQUOTED([PERL_INSTALLDIRS], [$PERL_INSTALLDIRS])
  +	    AC_SUBST(PERL_INSTALLDIRS)
           WITH_PERL_SUBDIR=perl
           WITH_PERL_SUBPACKAGE=1
           AC_CONFIG_FILES([perl/Makefile.PL])
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/perl/Makefile.PL.in
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 Makefile.PL.in
  --- rpm/perl/Makefile.PL.in	15 Jan 2008 23:39:13 -0000	1.17
  +++ rpm/perl/Makefile.PL.in	16 Jan 2008 01:18:38 -0000	1.18
  @@ -45,5 +45,6 @@
   	      'INC'	=> join(' ', map { '-I@top_srcdir@/'. $_ } @libdir) . ' @CPPFLAGS@',
   	      'INSTALLMAN1DIR'	=> '@mandir@/man1',
   	      'INSTALLMAN3DIR'	=> '@mandir@/man3',
  +	      @PERL_INSTALLDIRS@
   );
   
  @@ .