[Bps-public-commit] RT-Extension-ActivityReports branch, master, updated. 1.06-7-ge41146c

[Dustin Graves]

The branch, master has been updated
       via  e41146c485edc964d6142c29fdd9a201cfb62087 (commit)
      from  11b14a238d325fee759fdbadd501e769277522bc (commit)

Summary of changes:
 inc/Module/Install/RTx.pm | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

- Log -----------------------------------------------------------------
commit e41146c485edc964d6142c29fdd9a201cfb62087
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Mon Jul 11 17:48:39 2016 +0000

    Update Module::Install::RTx

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index cb4cfde..97acf77 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -37,13 +37,6 @@ 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};
@@ -78,13 +71,7 @@ sub RTx {
 
     # Installation locations
     my %path;
-    my $plugin_path;
-    if ( $installdirs && $installdirs eq 'vendor' ) {
-        $plugin_path = $RT::PluginPath;
-    } else {
-        $plugin_path = $RT::LocalPluginPath;
-    }
-    $path{$_} = $plugin_path . "/$name/$_"
+    $path{$_} = $RT::LocalPluginPath . "/$name/$_"
         foreach @DIRS;
 
     # Copy RT 4.2.0 static files into NoAuth; insufficient for
@@ -98,7 +85,7 @@ sub RTx {
     my %index = map { $_ => 1 } @INDEX_DIRS;
     $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS;
 
-    my $args = join ', ', map "q($_)", map { ($_, "\$(DESTDIR)$path{$_}") }
+    my $args = join ', ', map "q($_)", map { ($_, $path{$_}) }
         sort keys %path;
 
     printf "%-10s => %s\n", $_, $path{$_} for sort keys %path;
@@ -144,7 +131,6 @@ 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 => { "" => "" }, );
     }
@@ -153,13 +139,6 @@ 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 = '';
@@ -279,4 +258,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 428
+#line 390

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