r27378 - /trunk/dh-make-perl/dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Nov 28 17:19:27 2008
New Revision: 27378

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27378
Log:
make $datadir an option -- $opt_datadir

Modified:
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=27378&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Fri Nov 28 17:19:27 2008
@@ -446,7 +446,7 @@
 my ($min_perl_version, $debstdversion, $priority,  $section,
     @depends,          @bdepends,      @bdependsi, $maintainer,
     $arch,             $closes,        $date,      $debiandir,
-    $startdir,         $datadir,       $homedir,
+    $startdir,         $homedir,
 );
 our %overrides;
 
@@ -465,7 +465,6 @@
 $arch      = 'all';
 $date      = email_date(time);
 $startdir  = getcwd();
-$datadir   = '/usr/share/dh-make-perl';
 $homedir   = "$ENV{HOME}/.dh-make-perl";
 
 # If we're being required rather than called as a main command, then
@@ -494,13 +493,14 @@
 my $opt_verbose      = 1;
 my $opt_email        = '';
 my $opt_exclude      = '(?:\/|^)(?:CVS|\.svn)\/';
+my $opt_datadir      = '/usr/share/dh-make-perl';
 
 my ($opt_arch,        $opt_basepkgs, $opt_bdepends,    $opt_bdependsi,
     $opt_depends,     $opt_build,    $opt_install,     $opt_core_ok,
     $opt_cpan,        $opt_cpanplus, $opt_cpan_mirror, $opt_closes,
     $opt_dbflags,     $opt_desc,     $opt_help,        $opt_nometa,
     $opt_notest,      $opt_pkg_perl, $opt_requiredeps, $opt_version,
-    $opt_packagename, $opt_refresh
+    $opt_packagename, $opt_refresh,  $opt_datadir
 );
 
 my $mod_cpan_version;
@@ -537,6 +537,7 @@
     'sources-list=s'  => \$opt_sources_list,
     'dist=s'          => \$opt_dist,
     'verbose!'        => \$opt_verbose,
+    'data-dir=s'      => \$opt_datadir,
 ) or die usage_instructions();
 
 @bdepends = ( Dep->new( 'debhelper', $opt_dh ) );
@@ -1591,7 +1592,7 @@
         : "rules.$module_build.xs"
     );
 
-    for my $source ( ( "$homedir/$rulesname", "$datadir/$rulesname" ) ) {
+    for my $source ( ( "$homedir/$rulesname", "$opt_datadir/$rulesname" ) ) {
         copy( $source, $file ) && do {
             print "Using rules: $source\n";
             last;
@@ -1836,7 +1837,7 @@
 
 sub load_overrides {
     eval {
-        do "$datadir/overrides" if -f "$datadir/overrides";
+        do "$opt_datadir/overrides" if -f "$opt_datadir/overrides";
         do "$homedir/overrides" if -f "$homedir/overrides";
     };
     if ($@) {
@@ -2158,6 +2159,14 @@
 
 Default: C<--verbose>
 
+=item B<--data-dir directory>
+
+Use another data directory, instead of the default, C</usr/share/dh-make-perl>
+
+Data directory is were B<dh-make-perl> looks for its rules.* templates. It is
+similar to B<--homedir>, but does not change the location of the APT Contents
+cache file. If both are given, B<--homedir> takes precedence.
+
 =back
 
 =head1 DESCRIPTION