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:40:02
Branch: rpm-5_0 Handle: 2008011601400101
Modified files: (Branch: rpm-5_0)
rpm CHANGES configure.ac
rpm/perl Makefile.PL.in
Log:
make perl install directory overriddable
Summary:
Revision Changes Path
1.2054.2.7 +1 -0 rpm/CHANGES
2.269.2.4 +9 -0 rpm/configure.ac
1.16.2.2 +1 -0 rpm/perl/Makefile.PL.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.6 -r1.2054.2.7 CHANGES
--- rpm/CHANGES 16 Jan 2008 01:38:29 -0000 1.2054.2.6
+++ rpm/CHANGES 16 Jan 2008 01:40:01 -0000 1.2054.2.7
@@ -1,4 +1,5 @@
5.0.0 -> 5.0.1:
+ - 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)
- proyvind: fix install location of rpm.pc (lib64 fix)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.269.2.3 -r2.269.2.4 configure.ac
--- rpm/configure.ac 16 Jan 2008 01:37:02 -0000 2.269.2.3
+++ rpm/configure.ac 16 Jan 2008 01:40:01 -0000 2.269.2.4
@@ -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.16.2.1 -r1.16.2.2 Makefile.PL.in
--- rpm/perl/Makefile.PL.in 16 Jan 2008 01:38:29 -0000 1.16.2.1
+++ rpm/perl/Makefile.PL.in 16 Jan 2008 01:40:02 -0000 1.16.2.2
@@ -45,5 +45,6 @@
'INC' => join(' ', map { '-I@top_srcdir@/'. $_ } @libdir) . ' @CPPFLAGS@',
'INSTALLMAN1DIR' => '@mandir@/man1',
'INSTALLMAN3DIR' => '@mandir@/man3',
+ @PERL_INSTALLDIRS@
);
@@ .
Received on Wed Jan 16 02:40:02 2008