[Bps-public-commit] Module-Install-RTx branch, master, updated. 0.37-4-g1e60a24

[Shawn Moore]

The branch, master has been updated
       via  1e60a24769e5f969f69a9437f591417feca41569 (commit)
       via  17182da07585e5c6c5334f3d3bc720b754cdd9ca (commit)
      from  72a91d6ecb4a3ab4a0e34fd2bfe94f57c6318f03 (commit)

Summary of changes:
 lib/Module/Install/RTx.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 17182da07585e5c6c5334f3d3bc720b754cdd9ca
Author: Ben Walton <bwalton at artsci.utoronto.ca>
Date:   Thu Jan 20 15:10:10 2011 -0500

    Make postamble install targets honour DESTDIR
    
    Previously, the postamble install targets generated in the Makefile
    after calling perl Makefile.PL didn't honour DESTDIR, which led to
    problems when building using this module to package in rpms, etc.
    
    This change sees DESTDIR properly honoured at install time.
    
    Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>

diff --git a/lib/Module/Install/RTx.pm b/lib/Module/Install/RTx.pm
index 566179e..c9cea9d 100644
--- a/lib/Module/Install/RTx.pm
+++ b/lib/Module/Install/RTx.pm
@@ -99,7 +99,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{$_}") }
         grep $subdirs{$_}, keys %path;
 
     print "./$_\t=> $path{$_}\n" for sort keys %subdirs;

commit 1e60a24769e5f969f69a9437f591417feca41569
Merge: 72a91d6 17182da
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Nov 30 15:48:53 2015 -0500

    Merge remote-tracking branch 'bdwalton/master'
    
    Conflicts:
    	lib/Module/Install/RTx.pm

diff --cc lib/Module/Install/RTx.pm
index 90e7ef4,c9cea9d..135e0bf
--- a/lib/Module/Install/RTx.pm
+++ b/lib/Module/Install/RTx.pm
@@@ -97,12 -99,12 +97,12 @@@ 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{$_}") }
 -        grep $subdirs{$_}, keys %path;
 +        sort keys %path;
  
 -    print "./$_\t=> $path{$_}\n" for sort keys %subdirs;
 +    printf "%-10s => %s\n", $_, $path{$_} for sort keys %path;
  
 -    if ( my @dirs = map { ( -D => $_ ) } grep $subdirs{$_}, qw(bin html sbin) ) {
 +    if ( my @dirs = map { ( -D => $_ ) } grep $path{$_}, qw(bin html sbin etc) ) {
          my @po = map { ( -o => $_ ) }
              grep -f,
              File::Glob::bsd_glob("po/*.po");

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