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

diff --git a/tools/xml2ini.pl b/tools/xml2ini.pl
index 42825846d519ef74c9118ddce710bdc36311cf7a..3d1049d81dec91322797c1f6652c25dd10f2d90d 100755 (executable)
--- 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 7c75f5376d84ba7e654e56f89589991798c62f01..44d14c8452236e41bb7c6cf5066e193a323b0e01 100755 (executable)
--- 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;