Use the confdir we compiled with (/etc/mplayer/mplayer.conf instead of

/etc/mplayer.conf).  Spotted by Kiss Gabor <kissg@sztaki.hu>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7097 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 4 deletions

diff --git a/debian/postinst b/debian/postinst
index 5653828639..85fc11e227 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -13,7 +13,7 @@ my $didupgrade = 0;
 
 dealwithupgrades();
 
-my $mcfg = new ConfHelper('mplayer', "/etc/mplayer.conf");
+my $mcfg = new ConfHelper('mplayer', "/etc/mplayer/mplayer.conf");
 $mcfg->setconfarea("
 #MPlayer config file generated by .deb package.
 #ffactor	=	0.9
@@ -48,10 +48,10 @@ get("mplayer/cfgnote");
 
 
 sub dealwithupgrades {
-  open(OLDCONF, "</etc/mplayer.conf") || return 1;
+  open(OLDCONF, "</etc/mplayer/mplayer.conf") || return 1;
   close OLDCONF;
 
-  my $mconf = new ConfHelper("mplayer", "/etc/mplayer.conf");
+  my $mconf = new ConfHelper("mplayer", "/etc/mplayer/mplayer.conf");
   return 1 if ($mconf->hasconfarea());
   undef $mconf;
 
@@ -60,7 +60,7 @@ sub dealwithupgrades {
     print STDERR "Upgrading...\n";
 #?    saveolddata("/etc/network/interfaces", "pppconf");
     $didupgrade = 1;
-    for my $file ("/etc/mplayer.conf"
+    for my $file ("/etc/mplayer/mplayer.conf"
     #, "/etc/mplayer/fonts/sth
     ) {
       debug("Deleting $file");