configuration.pl.in configured

diff --git a/helm/configuration/configure.in b/helm/configuration/configure.in
index 9a4d94cfdc04f8870b68b45e686679d8aa32e7b0..c96778800e097e67a14528e567c8368c93580d84 100644 (file)
--- a/helm/configuration/configure.in
+++ b/helm/configuration/configure.in
@@ -18,4 +18,4 @@ HELM_ETC_DIR=$RESOLVED_PREFIX/etc/helm
 AC_SUBST(HELM_LIB_DIR)
 AC_SUBST(HELM_ETC_DIR)
 
-AC_OUTPUT([Makefile])
+AC_OUTPUT([Makefile lib/configuration.pl])

diff --git a/helm/configuration/lib/configuration.pl.in b/helm/configuration/lib/configuration.pl.in
index e88d8fbe715fb7b429bc1ebbd44c22591664e8ec..6c101d79ef1a8190e90e5f7810cd4d78c6149ff8 100644 (file)
--- a/helm/configuration/lib/configuration.pl.in
+++ b/helm/configuration/lib/configuration.pl.in
@@ -1,11 +1,13 @@
 use XML::Parser;
 
 use Env;
-my $HELM_CONFIGURATION_PREFIX = $ENV{"HELM_CONFIGURATION_PREFIX"};
+my $HELM_CONFIGURATION_DIR = $ENV{"HELM_CONFIGURATION_DIR"};
+my $DEFAULT_HELM_CONFIGURATION_DIR = @HELM_ETC_DIR@;
 # this should be the only fixed constant
-if (defined ($HELM_CONFIGURATION_PREFIX) {
-   $configuration_file =
-    $HELM_CONFIGURATION_PREFIX."/etc/helm/configuration.xml";
+if (defined ($HELM_CONFIGURATION_DIR) {
+   $configuration_file = $HELM_CONFIGURATION_DIR."/configuration.xml";
+} else {
+   $configuration_file = $DEFAULT_HELM_CONFIGURATION_DIR."/configuration.xml";
 }
 
 $parser = new XML::Parser(Handlers => {Start => \&handle_start,