Redo directory structure.

[usenet/newsstats.git] / install / install.pl

diff --git a/install/install.pl b/install/install.pl
index 4069bf5..a5860d4 100755 (executable)
--- a/install/install.pl
+++ b/install/install.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -W
+#! /usr/bin/perl

 #
 # install.pl
 #
 #
 # install.pl
 #


@@ -6,7 +6,7 @@
 # 
 # It is part of the NewsStats package.
 #
 # 
 # It is part of the NewsStats package.
 #

-# Copyright (c) 2010-2012 Thomas Hochstein <thh@inter.net>
+# Copyright (c) 2010-2013 Thomas Hochstein <thh@inter.net>

 #
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.
 #
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.


@@ -14,10 +14,11 @@
 BEGIN {
   our $VERSION = "0.01";
   use File::Basename;
 BEGIN {
   our $VERSION = "0.01";
   use File::Basename;

-  # we're in .../install, so our module is in ..
-  push(@INC, dirname($0).'/..');
+  # we're in .../install, so our module is in ../lib
+  push(@INC, dirname($0).'/../lib');

 }
 use strict;
 }
 use strict;

+use warnings;

 
 use NewsStats qw(:DEFAULT);
 
 
 use NewsStats qw(:DEFAULT);
 


@@ -41,7 +42,7 @@ my $Path = cwd();
 
 ### read configuration
 print("Reading configuration.\n");
 
 ### read configuration
 print("Reading configuration.\n");

-my %Conf = %{ReadConfig($Path.'/newsstats.conf')};
+my %Conf = %{ReadConfig('')};

 
 ##### --------------------------------------------------------------------------
 ##### Database table definitions
 
 ##### --------------------------------------------------------------------------
 ##### Database table definitions


@@ -293,15 +294,15 @@ Don't do a fresh install, but update from I<version>.
 
 =over 4
 
 
 =over 4
 

-=item F<install.pl>
+=item F<install/install.pl>

 
 The script itself.
 
 
 The script itself.
 

-=item F<NewsStats.pm>
+=item F<lib/NewsStats.pm>

 
 Library functions for the NewsStats package.
 
 
 Library functions for the NewsStats package.
 

-=item F<newsstats.conf>
+=item F<etc/newsstats.conf>

 
 Runtime configuration file.
 
 
 Runtime configuration file.