Merge tag 'upstream/3.3.3'

[debian/amanda] / server-src / amserverconfig.pl

diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl
index a05dd18b2b124949bda68f3af3e2f1eea3599498..919c71072f2f7a05770c85d20fe84278b4966531 100755 (executable)
--- a/server-src/amserverconfig.pl
+++ b/server-src/amserverconfig.pl
@@ -2,9 +2,10 @@
 #
 # Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -31,7 +32,7 @@ use Amanda::Constants;
 
 my $confdir="$CONFIG_DIR";
 my $tmpdir="$AMANDA_DBGDIR";
-my $amandahomedir="$localstatedir/lib/amanda";
+my $amandahomedir="$localstatedir/amanda";
 my $templatedir="$amdatadir/template.d"; #rpm install template files here
 my $def_tapedev="file:$amandahomedir/vtapes";