From: Michael Wiebusch <stratomaster@gmx.net>
Date: Wed, 21 Aug 2013 11:54:19 +0000 (+0200)
Subject: xml2ini and xmlOperation.pl now use CONFDIR and SPECDIR from Environment.pm
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8407bdc40cc4c73498136b7808a4833f29a3073a;p=mvdsensorcontrol.git

xml2ini and xmlOperation.pl now use CONFDIR and SPECDIR from Environment.pm
---

diff --git a/tools/xml2ini.pl b/tools/xml2ini.pl
index 4282584..3d1049d 100755
--- a/tools/xml2ini.pl
+++ b/tools/xml2ini.pl
@@ -10,7 +10,9 @@ use Pod::Usage;
 require Common;
 require xmlOperations;
 
-
+use FindBin;
+use lib "$FindBin::Bin/..";
+use Environment;
 
 # TODO:
 
@@ -109,8 +111,8 @@ my $configFileName  = ""; #don't get it confused with $configFileName in xmlOper
 
 ###############################
 
-our $confDir = '../config'; # default, gets overwritten anyway
-our $specDir = '../specs';
+our $confDir = CONFDIR; # default, gets overwritten anyway
+our $specDir = SPECDIR;
 
 # separate configFileName and the containing directory path
 my @configFilePath = split("/",$configFile);
diff --git a/tools/xmlOperation.pl b/tools/xmlOperation.pl
index 7c75f53..44d14c8 100755
--- a/tools/xmlOperation.pl
+++ b/tools/xmlOperation.pl
@@ -18,8 +18,12 @@ use CGI::Carp qw(fatalsToBrowser);
 require Common;
 require xmlOperations;
 
-our $confDir = '../config';
-our $specDir = '../specs';
+use FindBin;
+use lib "$FindBin::Bin/..";
+use Environment;
+
+our $confDir = CONFDIR;
+our $specDir = SPECDIR;
 
 
 my $q = CGI->new;