diff options
| author | fukachan <fukachan> | 2001-11-18 04:50:58 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2001-11-18 04:50:58 +0000 |
| commit | 3000dcd60009069583a45840bbaaed23d0727b92 (patch) | |
| tree | 9ea4e7e75bf9b94d642dda6684d034afabf7cca3 | |
| parent | 432cb9f419ef9ed5ac0bc0dfc0272e2982884dca (diff) | |
| download | fml8-3000dcd60009069583a45840bbaaed23d0727b92.tar.gz fml8-3000dcd60009069583a45840bbaaed23d0727b92.tar.bz2 fml8-3000dcd60009069583a45840bbaaed23d0727b92.zip | |
speculate program paths by configure (autoconf)
| -rwxr-xr-x | INSTALL.sh | 5 | ||||
| -rw-r--r-- | fml/etc/main.cf.in | 7 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Switch.pm | 3 |
3 files changed, 11 insertions, 4 deletions
@@ -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: INSTALL.sh,v 1.33 2001/11/17 15:01:57 fukachan Exp $ +# $FML: INSTALL.sh,v 1.34 2001/11/18 02:39:33 fukachan Exp $ # # Run this from the top-level fml source directory. @@ -60,7 +60,8 @@ fi echo updating $default_config_dir/ cp fml/etc/default_config.cf.ja $default_config_dir/default_config.cf -cp fml/etc/config.cf.ja $default_config_dir/config.cf +cp fml/etc/config.cf.ja $default_config_dir/config.cf +cp fml/etc/paths.cf $default_config_dir/paths.cf echo updating $lib_dir/$fml_version/ cp -pr fml/lib/* $lib_dir/$fml_version/ diff --git a/fml/etc/main.cf.in b/fml/etc/main.cf.in index 39c43f82..63d8bbbc 100644 --- a/fml/etc/main.cf.in +++ b/fml/etc/main.cf.in @@ -1,5 +1,5 @@ # -# $FML$ +# $FML: main.cf.in,v 1.1 2001/11/12 14:33:03 fukachan Exp $ # # fml version @@ -63,6 +63,11 @@ default_domain = fml.org default_config_cf = $default_config_dir/default_config.cf +# path_$program collection +# Example: /etc/fml/defaults/5.0/default_config.cf +default_paths_cf = $default_config_dir/paths.cf + + # domain specific configurations # Example: /etc/fml/domains/fml.org/default_config.cf domain_default_config = $config_dir/domains/$default_domain/config.cf diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm index 024a8876..162047bd 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.38 2001/11/12 14:37:25 fukachan Exp $ +# $FML: Switch.pm,v 1.39 2001/11/17 04:03:37 fukachan Exp $ # package FML::Process::Switch; @@ -123,6 +123,7 @@ sub main::Bootstrap2 my $sitedef = File::Spec->catfile($main_cf->{ config_dir }, 'site_default_config.cf'); unshift(@$cf, $sitedef); + unshift(@$cf, $main_cf->{ default_paths_cf }); unshift(@$cf, $main_cf->{ default_config_cf }); # 3.1 set up @INC |