From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Aug 2009 16:12:34 +0000 (+0100)
Subject: Fix installation problems
X-Git-Tag: 3.4~105
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=6bf99c50a24be916c7a1d36a1b9705bdd7828f60

Fix installation problems
---

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 84ea710..387b0f2 100644
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -71,7 +71,7 @@ sub sourcebasedir () {
     return $dir;
 }
 
-my datadir () {
+sub datadir () {
     my $dir= sourcebasedir();
     if (stat "$dir/DATA") {
 	return "$dir/DATA";
@@ -86,6 +86,7 @@ my datadir () {
 my @ocean_list;
 
 sub ocean_list () {
+    my $datadir= datadir();
     if (!@ocean_list) {
 	my $fn= "$datadir/master-info.txt";
 	my $f= new IO::File $fn or die $!;