Imported Upstream version 3.1.0

[debian/amanda] / changer-src / chg-rth.pl

diff --git a/changer-src/chg-rth.pl b/changer-src/chg-rth.pl
index 9f755598e08cd77eb8e6e6e5367daef0ec8a1227..fc9ea9ee97431cf5f9d8829f345e6bfb832a9188 100644 (file)
--- a/changer-src/chg-rth.pl
+++ b/changer-src/chg-rth.pl
@@ -36,14 +36,9 @@ $exec_prefix="@exec_prefix@";
 $exec_prefix=$exec_prefix;     # ditto
 $sbindir="@sbindir@";
 $amlibexecdir="@amlibexecdir@";
-if ("@USE_VERSION_SUFFIXES@" eq "yes") {
-    $suf = "-@VERSION@";
-} else {
-    $suf = "";
-}
 
-if (-x "$sbindir/ammt$SUF") {
-       $MT="$sbindir/ammt$SUF";
+if (-x "$sbindir/ammt") {
+       $MT="$sbindir/ammt";
        $MTF="-f";
 } elsif (-x "@MT@") {
        $MT="@MT@";
@@ -53,7 +48,7 @@ if (-x "$sbindir/ammt$SUF") {
        exit(1);
 }
 
-$tapeDevice=`$sbindir/amgetconf$SUF tapedev`;
+$tapeDevice=`$sbindir/amgetconf tapedev`;
 die "tapedev not found in amanda.conf"
        if !$tapeDevice or $tapeDevice eq "" or
            $tapeDevice =~ m/no such parameter/;