Changeset 1503 in ProjectBuilder for devel

Timestamp:

May 9, 2012, 1:45:55 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Add possibility to use a PREFIX variable for Makefie.PL for pb-module (Eric Anderson) from b97fdb1f441101ad30da0f0d9ca399c57d08ffa8

Location:

devel

Files:

• pb-modules/Makefile.PL (modified) (1 diff)
• pb/Makefile.PL (modified) (1 diff)

devel/pb-modules/Makefile.PL

@@ -35 +35 @@
 
     # Grab out any CONFDIR or MANDIR param
-    my $confdir = undef;
+    my $etcdir = undef;
     my $mandir = undef;
+    my $prefix = undef;
 
     while (my $arg = shift @ARGV) {
         my ($key, $value) = split /=/, $arg;
         if ($key =~ /^CONFDIR$/) {
-            $confdir = $value;
+            $etcdir = $value;
         } elsif ($key =~ /^MANDIR$/) {
             $mandir = $value;
+        } elsif ($key =~ /^PREFIX$/) {
+            $prefix = $value;
         }
     }
 
-    my $etcdir = $confdir || "/usr/local/etc/pb";
-    my $mandir = $mandir || "/usr/local/share/man";
+    $etcdir ||= "$prefix/etc/pb";
+    $mandir ||= "$prefix/share/man";
+    $etcdir ||= "/usr/local/etc/pb";
+    $mandir ||= "/usr/local/share/man";
 
     # Use that conf dir info to modify Distribution.pm

devel/pb/Makefile.PL

@@ -18 +18 @@
     EXE_FILES     => [ qw( bin/pb bin/pbg bin/pbvi ) ],
     MAN1PODS      => { 'bin/pb' => '$(INST_MAN1DIR)/pb.$(MAN1EXT)', },
-    MAN3PODS      => {  'lib/ProjectBuilder/CMS.pm' => '$(INST_MAN3DIR)/ProjectBuilder::CMS.$(MAN3EXT)',
-                        'lib/ProjectBuilder/Filter.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Filter.$(MAN3EXT)',
-                        'lib/ProjectBuilder/Changelog.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Changelog.$(MAN3EXT)',
-                },
+    #MAN3PODS      => { 'lib/ProjectBuilder/CMS.pm' => '$(INST_MAN3DIR)/ProjectBuilder::CMS.$(MAN3EXT)',
+    #'lib/ProjectBuilder/Filter.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Filter.$(MAN3EXT)',
+    #'lib/ProjectBuilder/Changelog.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Changelog.$(MAN3EXT)',
+    #},
 );