Changeset 1503


Ignore:
Timestamp:
May 9, 2012, 1:45:55 AM (7 years ago)
Author:
bruno
Message:
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/Makefile.PL

    r1290 r1503  
    3535
    3636    # Grab out any CONFDIR or MANDIR param
    37     my $confdir = undef;
     37    my $etcdir = undef;
    3838    my $mandir = undef;
     39    my $prefix = undef;
    3940
    4041    while (my $arg = shift @ARGV) {
    4142        my ($key, $value) = split /=/, $arg;
    4243        if ($key =~ /^CONFDIR$/) {
    43             $confdir = $value;
     44            $etcdir = $value;
    4445        } elsif ($key =~ /^MANDIR$/) {
    4546            $mandir = $value;
     47        } elsif ($key =~ /^PREFIX$/) {
     48            $prefix = $value;
    4649        }
    4750    }
    4851
    49     my $etcdir = $confdir || "/usr/local/etc/pb";
    50     my $mandir = $mandir || "/usr/local/share/man";
     52    $etcdir ||= "$prefix/etc/pb";
     53    $mandir ||= "$prefix/share/man";
     54    $etcdir ||= "/usr/local/etc/pb";
     55    $mandir ||= "/usr/local/share/man";
    5156
    5257    # Use that conf dir info to modify Distribution.pm
  • devel/pb/Makefile.PL

    r1312 r1503  
    1818    EXE_FILES     => [ qw( bin/pb bin/pbg bin/pbvi ) ],
    1919    MAN1PODS      => { 'bin/pb' => '$(INST_MAN1DIR)/pb.$(MAN1EXT)', },
    20     MAN3PODS      => {  'lib/ProjectBuilder/CMS.pm' => '$(INST_MAN3DIR)/ProjectBuilder::CMS.$(MAN3EXT)',
    21                         'lib/ProjectBuilder/Filter.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Filter.$(MAN3EXT)',
    22                         'lib/ProjectBuilder/Changelog.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Changelog.$(MAN3EXT)',
    23                 },
     20    #MAN3PODS      => { 'lib/ProjectBuilder/CMS.pm' => '$(INST_MAN3DIR)/ProjectBuilder::CMS.$(MAN3EXT)',
     21    #'lib/ProjectBuilder/Filter.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Filter.$(MAN3EXT)',
     22    #'lib/ProjectBuilder/Changelog.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Changelog.$(MAN3EXT)',
     23    #},
    2424);
Note: See TracChangeset for help on using the changeset viewer.