X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2FCommodsWeb.pm;h=f82e09cb2de18fad2d1ec7db7a195516b9e4c264;hp=5e1520e22f45a3e0d3853f53e6523f1b370e6e5c;hb=d97ce2e06c50ce30882d3482dfaefa14e52b309f;hpb=2961c979e0f7bdae7183d49ab7fab5f5830dff4e diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm index 5e1520e..f82e09c 100644 --- a/yarrg/CommodsWeb.pm +++ b/yarrg/CommodsWeb.pm @@ -43,20 +43,30 @@ BEGIN { our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); $VERSION = 1.00; @ISA = qw(Exporter); - @EXPORT = qw(&dbw_connect &ocean_list); + @EXPORT = qw(&dbw_connect &ocean_list $sourcebasedir); %EXPORT_TAGS = ( ); @EXPORT_OK = qw(); } our $datadir='.'; +our $sourcebasedir; for my $dir (@INC) { if ($dir =~ m/\.perl-lib$/) { - $datadir= "$dir/DATA"; + $sourcebasedir= "$dir/.."; + if (stat "$dir/DATA") { + $datadir= "$dir/DATA"; + } elsif ($!==&ENOENT) { + $datadir= "$dir"; + } else { + die "stat $dir/DATA $!"; + } last; } } +defined $sourcebasedir or + die "no source base dir in @INC"; my @ocean_list;