[Rt-commit] rtir branch, 4.0.0-releng, updated. 4.0.0rc2-15-g2d500a4

[Shawn Moore]

The branch, 4.0.0-releng has been updated
       via  2d500a438711a4c38eed429a8c97e95a60d8ba0e (commit)
       via  76aa1bd4e2843c44af63b429408902380015f5e2 (commit)
      from  a7b12be4f66e6c80e594f6fa4409c73b6a1254de (commit)

Summary of changes:
 META.yml                  |  6 +++---
 inc/Module/Install/RTx.pm | 29 +++++++++++++++++++++++++----
 lib/RT/IR.pm              |  2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 76aa1bd4e2843c44af63b429408902380015f5e2
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Jul 20 16:23:02 2016 +0000

    Regenerate toolchain

diff --git a/META.yml b/META.yml
index ee2074d..3a486b6 100644
--- a/META.yml
+++ b/META.yml
@@ -33,6 +33,6 @@ requires:
 resources:
   license: http://opensource.org/licenses/gpl-license.php
 version: 4.0.0rc2
-x_module_install_rtx_version: '0.37'
-x_requires_rt: 4.4.1rc2
+x_module_install_rtx_version: '0.38'
+x_requires_rt: 4.4.1
 x_rt_too_new: 4.6.0
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 97acf77..80538d3 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.37';
+our $VERSION = '0.38';
 
 use FindBin;
 use File::Glob     ();
@@ -37,6 +37,13 @@ sub RTx {
     }
     $self->add_metadata("x_module_install_rtx_version", $VERSION );
 
+    my $installdirs = $ENV{INSTALLDIRS};
+    for ( @ARGV ) {
+        if ( /INSTALLDIRS=(.*)/ ) {
+            $installdirs = $1;
+        }
+    }
+
     # Try to find RT.pm
     my @prefixes = qw( /opt /usr/local /home /usr /sw /usr/share/request-tracker4);
     $ENV{RTHOME} =~ s{/RT\.pm$}{} if defined $ENV{RTHOME};
@@ -71,7 +78,13 @@ sub RTx {
 
     # Installation locations
     my %path;
-    $path{$_} = $RT::LocalPluginPath . "/$name/$_"
+    my $plugin_path;
+    if ( $installdirs && $installdirs eq 'vendor' ) {
+        $plugin_path = $RT::PluginPath;
+    } else {
+        $plugin_path = $RT::LocalPluginPath;
+    }
+    $path{$_} = $plugin_path . "/$name/$_"
         foreach @DIRS;
 
     # Copy RT 4.2.0 static files into NoAuth; insufficient for
@@ -85,7 +98,7 @@ sub RTx {
     my %index = map { $_ => 1 } @INDEX_DIRS;
     $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS;
 
-    my $args = join ', ', map "q($_)", map { ($_, $path{$_}) }
+    my $args = join ', ', map "q($_)", map { ($_, "\$(DESTDIR)$path{$_}") }
         sort keys %path;
 
     printf "%-10s => %s\n", $_, $path{$_} for sort keys %path;
@@ -131,6 +144,7 @@ install ::
     if ( $path{lib} ) {
         $self->makemaker_args( INSTALLSITELIB => $path{'lib'} );
         $self->makemaker_args( INSTALLARCHLIB => $path{'lib'} );
+        $self->makemaker_args( INSTALLVENDORLIB => $path{'lib'} )
     } else {
         $self->makemaker_args( PM => { "" => "" }, );
     }
@@ -139,6 +153,13 @@ install ::
     $self->makemaker_args( INSTALLSITEMAN3DIR => "$RT::LocalPath/man/man3" );
     $self->makemaker_args( INSTALLSITEARCH => "$RT::LocalPath/man" );
 
+    # INSTALLDIRS=vendor should install manpages into /usr/share/man.
+    # That is the default path in most distributions. Need input from
+    # Redhat, Centos etc.
+    $self->makemaker_args( INSTALLVENDORMAN1DIR => "/usr/share/man/man1" );
+    $self->makemaker_args( INSTALLVENDORMAN3DIR => "/usr/share/man/man3" );
+    $self->makemaker_args( INSTALLVENDORARCH => "/usr/share/man" );
+
     if (%has_etc) {
         print "For first-time installation, type 'make initdb'.\n";
         my $initdb = '';
@@ -258,4 +279,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 390
+#line 428

commit 2d500a438711a4c38eed429a8c97e95a60d8ba0e
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Jul 20 16:24:01 2016 +0000

    Bump to 4.0.0

diff --git a/META.yml b/META.yml
index 3a486b6..107f45c 100644
--- a/META.yml
+++ b/META.yml
@@ -32,7 +32,7 @@ requires:
   perl: 5.10.1
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 4.0.0rc2
+version: 4.0.0
 x_module_install_rtx_version: '0.38'
 x_requires_rt: 4.4.1
 x_rt_too_new: 4.6.0
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 04980c4..eb2b05e 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -51,7 +51,7 @@ use 5.008003;
 use strict;
 use warnings;
 
-our $VERSION = '4.0.0rc2';
+our $VERSION = '4.0.0';
 
 use Scalar::Util qw(blessed);
 

-----------------------------------------------------------------------