summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-11-12 14:33:03 +0000
committerfukachan <fukachan>2001-11-12 14:33:03 +0000
commitbd9320e827ec9e94d5d8a69785c97c9694ebbcdc (patch)
tree546bac1176ed7cb968433c29f93c3723d3894625
parentff7858b8d2724d96e4543a70ea65be87a1df1279 (diff)
downloadfml8-bd9320e827ec9e94d5d8a69785c97c9694ebbcdc.tar.gz
fml8-bd9320e827ec9e94d5d8a69785c97c9694ebbcdc.tar.bz2
fml8-bd9320e827ec9e94d5d8a69785c97c9694ebbcdc.zip
main.cf.in not main.cf for configure (autoconf)
-rw-r--r--fml/etc/.cvsignore1
-rw-r--r--fml/etc/main.cf.in (renamed from fml/etc/main.cf)40
2 files changed, 18 insertions, 23 deletions
diff --git a/fml/etc/.cvsignore b/fml/etc/.cvsignore
new file mode 100644
index 00000000..3423e793
--- /dev/null
+++ b/fml/etc/.cvsignore
@@ -0,0 +1 @@
+main.cf
diff --git a/fml/etc/main.cf b/fml/etc/main.cf.in
index 500df717..39c43f82 100644
--- a/fml/etc/main.cf
+++ b/fml/etc/main.cf.in
@@ -1,3 +1,7 @@
+#
+# $FML$
+#
+
# fml version
# This is important
# Example: fml 5.0
@@ -10,47 +14,37 @@ fml_version = __fml_version__
### DIRECTORIES
###
+# Example: /usr/local
+prefix = @prefix@
+exec_prefix = @exec_prefix@
# $config_dir holds the global main configuration and
# several version-dependent default configurations
# Example: /etc/fml
-config_dir = __config_dir__
+config_dir = @sysconfdir@
# Example: /etc/fml/defaults/$fml_version
-default_config_dir = $config_dir/defaults/$fml_version
-
-# Example: /usr/local
-default_prefix = __default_prefix__
-
-
-# Example: /usr/local/libexec/fml
-libexec_prefix = $default_prefix
-
-# Example: /usr/local/lib/fml
-lib_prefix = $default_prefix
-
-# Example: /usr/local/share/fml
-share_prefix = $default_prefix
+default_config_dir = $config_dir/defaults/$fml_version
# Example: /usr/local/libexec/fml/$fml_version
-libexec_dir = $libexec_prefix/libexec/fml/$fml_version
+libexec_dir = @libexecdir@/fml/$fml_version
# Example: /usr/local/lib/fml/$fml_version
-lib_dir = $lib_prefix/lib/fml/$fml_version
+lib_dir = @libdir@/fml/$fml_version
# Example: /usr/local/share/fml/$fml_version
-share_dir = $share_prefix/share/fml/$fml_version
+share_dir = @datadir@/fml/$fml_version
# site local library location
# which is prepared but not used by fml itself
-local_lib_dir = $default_prefix/lib/fml/site_local
+local_lib_dir = @libdir@/fml/site_local
# ml's home directories
# $ml_home_dir (e.g. /var/spool/ml/elena ) is taken from loader's @ARGV.
# This is compatible with fml 4.0.
# Example: /var/spool/ml
-ml_home_prefix = /var/spool/ml
+ml_home_prefix = /var/spool/ml
@@ -60,15 +54,15 @@ ml_home_prefix = /var/spool/ml
# default domain
-default_domain = fml.org
+default_domain = fml.org
# version dependent default_config.cf location
# whic holds
# Example: /etc/fml/defaults/5.0/default_config.cf
-default_config = $config_dir/defaults/$fml_version/default_config.cf
+default_config_cf = $default_config_dir/default_config.cf
# domain specific configurations
# Example: /etc/fml/domains/fml.org/default_config.cf
-domain_default_config = $config_dir/domains/$default_domain/config.cf
+domain_default_config = $config_dir/domains/$default_domain/config.cf