move loading of search module into BackupPC::Search

[BackupPC.git] / lib / BackupPC / Lib.pm

diff --git a/lib/BackupPC/Lib.pm b/lib/BackupPC/Lib.pm
index cb66a10..6e1fe8f 100644 (file)
--- a/lib/BackupPC/Lib.pm
+++ b/lib/BackupPC/Lib.pm
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0beta0, released 5 April 2009.
+# Version 3.2.0, released 31 Jul 2010.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -96,7 +96,7 @@ sub new
     # Whether to use filesystem hierarchy standard for file layout.
     # If set, text config files are below /etc/BackupPC.
     #
-    my $useFHS = 0;
+    my $useFHS = 1;
     my $paths;
 
     #
@@ -105,6 +105,8 @@ sub new
     $topDir     = '/data/BackupPC' if ( $topDir eq "" );
     $installDir = '/usr/local/BackupPC'    if ( $installDir eq "" );
 
+       $confDir = '/etc/BackupPC'; # FIXME remove this! XXX
+
     #
     # Pick some initial defaults.  For FHS the only critical
     # path is the ConfDir, since we get everything else out
@@ -130,7 +132,7 @@ sub new
 
     my $bpc = bless {
        %$paths,
-        Version => '3.2.0beta0',
+        Version => '3.2.0',
     }, $class;
 
     $bpc->{storage} = BackupPC::Storage->new($paths);