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

  Server: rpm5.org                         Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs                       Email:  arekm@rpm5.org
  Module: rpm                              Date:   10-Jul-2007 22:38:28
  Branch: HEAD                             Handle: 2007071021382800

  Modified files:
    rpm                     configure.ac
    rpm/python              Makefile.am

  Log:
    Added --with-python-inc-dir and --with-python-lib-dir since python
    prefix can be different from rpm installation prefix.

  Summary:
    Revision    Changes     Path
    2.172       +7  -0      rpm/configure.ac
    1.73        +2  -2      rpm/python/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.171 -r2.172 configure.ac
  --- rpm/configure.ac	10 Jul 2007 19:56:03 -0000	2.171
  +++ rpm/configure.ac	10 Jul 2007 20:38:28 -0000	2.172
  @@ -700,6 +700,13 @@
   AC_SUBST(WITH_PYTHON_SUBPACKAGE)
   AC_SUBST(WITH_PYTHON_VERSION)
   
  +AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
  +	[WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="\$(prefix)/include/python${WITH_PYTHON_VERSION}"])
  +AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
  +	[WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="\${prefix}/lib${MARK64}/python${WITH_PYTHON_VERSION}"])
  +AC_SUBST(WITH_PYTHON_INCDIR)
  +AC_SUBST(WITH_PYTHON_LIBDIR)
  +
   dnl ##
   dnl ## ==== THIRD-PARTY LIBRARIES (2/2) ====
   dnl ##
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.72 -r1.73 Makefile.am
  --- rpm/python/Makefile.am	2 Jul 2007 17:13:20 -0000	1.72
  +++ rpm/python/Makefile.am	10 Jul 2007 20:38:28 -0000	1.73
  @@ -4,8 +4,8 @@
   
   LINT = splint
   
  -pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
  -pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
  +pylibdir = @WITH_PYTHON_LIBDIR@
  +pyincdir = @WITH_PYTHON_INCDIR@
   
   SUBDIRS = rpm
   
  @@ .