summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-11-12 13:41:34 +0000
committerfukachan <fukachan>2001-11-12 13:41:34 +0000
commitd94004870230f705990d7c25addcc5f2e47e217b (patch)
treec06476dad8c38fddc86b8657eef8625594fd8894
parent7ef531ea207d0db186c4f989ccf52ead4ce5f83d (diff)
downloadfml8-d94004870230f705990d7c25addcc5f2e47e217b.tar.gz
fml8-d94004870230f705990d7c25addcc5f2e47e217b.tar.bz2
fml8-d94004870230f705990d7c25addcc5f2e47e217b.zip
fix to introduce $config_dir (etc/fml) from main.cf
-rw-r--r--fml/lib/FML/Process/Switch.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm
index 21a8e375..333dd927 100644
--- a/fml/lib/FML/Process/Switch.pm
+++ b/fml/lib/FML/Process/Switch.pm
@@ -4,7 +4,7 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: Switch.pm,v 1.35 2001/11/10 04:01:11 fukachan Exp $
+# $FML: Switch.pm,v 1.36 2001/11/11 13:37:41 fukachan Exp $
#
package FML::Process::Switch;
@@ -119,7 +119,10 @@ sub main::Bootstrap2
# 2.3 prepare @$cf
# XXX hmm, .. '/etc/fml/site_default_config.cf' is good ???
- unshift(@$cf, '/etc/fml/site_default_config.cf');
+ use File::Spec;
+ my $sitedef =
+ File::Spec->catfile($main_cf->{ config_dir }, 'site_default_config.cf');
+ unshift(@$cf, $sitedef);
unshift(@$cf, $main_cf->{ default_config });
# 3.1 set up @INC