diff options
| -rwxr-xr-x | config.sh.in | 5 | ||||
| -rw-r--r-- | fml/etc/install.cf.in | 8 | ||||
| -rw-r--r-- | fml/etc/main.cf.in | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/config.sh.in b/config.sh.in index bf86d457..f0d325fa 100755 --- a/config.sh.in +++ b/config.sh.in @@ -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: config.sh.in,v 1.7 2002/03/31 12:12:28 fukachan Exp $ +# $FML: config.sh.in,v 1.8 2003/01/28 04:12:36 fukachan Exp $ # @@ -20,11 +20,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ mandir=@mandir@ +datarootdir=@datarootdir@ config_dir=@fmlconfdir@ libexec_dir=@libexecdir@/fml lib_dir=@libdir@/fml -data_dir=@datadir@/fml +data_dir=@datarootdir@/fml # ml spool diff --git a/fml/etc/install.cf.in b/fml/etc/install.cf.in index 4a30e465..d51343f0 100644 --- a/fml/etc/install.cf.in +++ b/fml/etc/install.cf.in @@ -3,7 +3,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.cf.in,v 1.21 2006/02/01 12:35:45 fukachan Exp $ +# $FML: install.cf.in,v 1.22 2006/02/04 06:48:58 fukachan Exp $ # @@ -22,6 +22,8 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ + bindir = @bindir@ mandir = @mandir@ @@ -34,7 +36,7 @@ libexec_dir = @libexecdir@/fml lib_dir = @libdir@/fml -data_dir = @datadir@/fml +data_dir = @datarootdir@/fml # ml spool @@ -128,4 +130,4 @@ libexec_programs = fml.pl faker createonpost fetchfml - + remind diff --git a/fml/etc/main.cf.in b/fml/etc/main.cf.in index 70097dd7..ae745734 100644 --- a/fml/etc/main.cf.in +++ b/fml/etc/main.cf.in @@ -1,5 +1,5 @@ # -# $FML: main.cf.in,v 1.19 2004/09/29 05:04:07 fukachan Exp $ +# $FML: main.cf.in,v 1.20 2004/11/21 06:55:47 fukachan Exp $ # # fml version @@ -21,6 +21,7 @@ fml_group = @fml_group@ # Example: /usr/local prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ # $config_dir holds the global main configuration and # several version-dependent default configurations @@ -48,7 +49,7 @@ libexec_dir = @libexecdir@/fml/$fml_version lib_dir = @libdir@/fml/$fml_version # Example: /usr/local/share/fml/$fml_version -share_dir = @datadir@/fml/$fml_version +share_dir = @datarootdir@/fml/$fml_version # site local library location # which is prepared but not used by fml itself |