default_config.cf includes paths.cf in it

configure rewrites default_config.cf directly

7 files changed, 87 insertions, 100 deletions

diff --git a/fml/etc/.cvsignore b/fml/etc/.cvsignore
index 0a6b4056..eaca9b19 100644
--- a/fml/etc/.cvsignore
+++ b/fml/etc/.cvsignore
@@ -1,2 +1,3 @@
 main.cf
 paths.cf
+default_config.cf.ja
diff --git a/fml/etc/.gen.sh b/fml/etc/.gen.sh
index bd3169f2..a4569e1e 100644
--- a/fml/etc/.gen.sh
+++ b/fml/etc/.gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FML$
+# $FML: .gen.sh,v 1.3 2001/06/17 08:57:08 fukachan Exp $
 #
 
 jatmp=default_config.cf.ja.$$
@@ -16,6 +16,6 @@ do
 	echo "" >> $jatmp
 done
 
-mv $jatmp default_config.cf.ja
+mv $jatmp default_config.cf.ja.in
 
 exit 0
diff --git a/fml/etc/Makefile b/fml/etc/Makefile
index 1e9b5907..421fc8bd 100644
--- a/fml/etc/Makefile
+++ b/fml/etc/Makefile
@@ -1,19 +1,12 @@
 #
-# $FML: Makefile,v 1.6 2001/04/30 10:21:44 fukachan Exp $
+# $FML: Makefile,v 1.7 2001/04/30 13:34:16 fukachan Exp $
 #
 
 TARGET_DIR = ../../Documentation/ja/etc
 
 CONV       = $(PERL) ../../fml/utils/bin/text2html.pl 
 
-all: default_config.cf.ja html
+all: default_config.cf.ja.in
 
-default_config.cf.ja: defaults/*
+default_config.cf.ja.in: defaults/*
 	sh .gen.sh
-
-html: $(TARGET_DIR)/variablelist.html
-
-$(TARGET_DIR)/variablelist.html: defaults/*cf* defaults/Configurations
-	test -d $(TARGET_DIR) || mkdir $(TARGET_DIR)
-	$(CONV) default_config.cf.ja > $(TARGET_DIR)/variablelist.html
-
diff --git a/fml/etc/default_config.cf.ja b/fml/etc/default_config.cf.ja.in
index 0f054bae..870a37f2 100644
--- a/fml/etc/default_config.cf.ja
+++ b/fml/etc/default_config.cf.ja.in
@@ -731,6 +731,59 @@ cgi_default_charset	=	euc-jp
 #     Examples:
 cgi_charset		=	$cgi_default_charset
 
+#
+# $FML: paths.cf.in,v 1.1 2001/11/18 02:35:05 fukachan Exp $
+#
+
+path_perl                 = @PERL@
+
+path_cksum                = @CKSUM@
+
+path_md5                  = @MD5@
+
+path_tar                  = @TAR@
+
+path_gzip                 = @GZIP@
+
+path_zcat                 = @ZCAT@
+
+path_gunzip               = @GUNZIP@
+
+path_lha                  = @LHA@
+
+path_ish                  = @ISH@
+
+path_bzip2                = @BZIP2@
+
+path_bunzip2              = @BUNZIP2@
+
+path_uuencode             = @UUENCODE@
+
+path_compress             = @COMPRESS@
+
+path_sendmail             = @SENDMAIL@
+
+path_nkf                  = @NKF@
+
+path_kakasi               = @KAKASI@
+
+path_namazu               = @NAMAZU@
+
+path_pgp                  = @PGP@
+
+path_pgp5                 = @PGP5@
+
+path_pgpe                 = @PGPe@
+
+path_pgpk                 = @PGPK@
+
+path_pgps                 = @PGPS@
+
+path_pgpv                 = @PGPV@
+
+path_gpg                  = @GPG@
+
+
 =head1	システム依存 (主に BSD との非互換性を記述している)
 
 #
diff --git a/fml/etc/defaults/Configurations b/fml/etc/defaults/Configurations
index eda9c495..8404857c 100644
--- a/fml/etc/defaults/Configurations
+++ b/fml/etc/defaults/Configurations
@@ -12,5 +12,6 @@ command.cf
 threadtrack.cf
 dbms.cf
 cgi.cf
+paths.cf
 system_dependence.cf
 __end__.cf
diff --git a/fml/etc/defaults/paths.cf.ja b/fml/etc/defaults/paths.cf.ja
index 7c51c24e..b10e26f1 100644
--- a/fml/etc/defaults/paths.cf.ja
+++ b/fml/etc/defaults/paths.cf.ja
@@ -1,61 +1,52 @@
-=head1	プログラムのパス名
+#
+# $FML: paths.cf.in,v 1.1 2001/11/18 02:35:05 fukachan Exp $
+#
 
-# 
-# 注意: デフォルトのパス名は NetBSD 1.5 リリース準拠です。
-# 
+path_perl                 = @PERL@
 
+path_cksum                = @CKSUM@
 
-=head2	メールサーバ
+path_md5                  = @MD5@
 
-path_sendmail	=	/usr/sbin/sendmail
+path_tar                  = @TAR@
 
+path_gzip                 = @GZIP@
 
-=head2	ファイル操作
+path_zcat                 = @ZCAT@
 
-path_tar	=	/usr/bin/tar
+path_gunzip               = @GUNZIP@
 
-path_uuencode	=	/usr/bin/uuencode
+path_lha                  = @LHA@
 
-path_compress	=	/usr/bin/compress
+path_ish                  = @ISH@
 
-path_zcat	=	/usr/bin/zcat
+path_bzip2                = @BZIP2@
 
-path_lha	=	
+path_bunzip2              = @BUNZIP2@
 
-path_ish	=	
+path_uuencode             = @UUENCODE@
 
-path_zip	=	
+path_compress             = @COMPRESS@
 
-path_bzip2	=	/usr/bin/bzip2
+path_sendmail             = @SENDMAIL@
 
+path_nkf                  = @NKF@
 
-=head2 バージョン管理
+path_kakasi               = @KAKASI@
 
-path_rcs	=	/usr/bin/rcs
+path_namazu               = @NAMAZU@
 
-path_ci		=	/usr/bin/ci
+path_pgp                  = @PGP@
 
-path_co		=	/usr/bin/co
+path_pgp5                 = @PGP5@
 
-path_cvs	=	
+path_pgpe                 = @PGPe@
 
+path_pgpk                 = @PGPK@
 
-=head2	認証
+path_pgps                 = @PGPS@
 
-path_md5	=	/usr/bin/md5
+path_pgpv                 = @PGPV@
 
-
-=head2	非対称暗号
-
-path_pgp	=	
-
-path_pgp5	=	
-
-path_pgpe	=	
-
-path_pgpk	=	
-
-path_pgps	=	
-
-path_pgpv	=	
+path_gpg                  = @GPG@
 
diff --git a/fml/etc/paths.cf.in b/fml/etc/paths.cf.in
deleted file mode 100644
index e47a94e8..00000000
--- a/fml/etc/paths.cf.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# $FML$
-#
-
-path_perl                 = @PERL@
-
-path_cksum                = @CKSUM@
-
-path_md5                  = @MD5@
-
-path_tar                  = @TAR@
-
-path_gzip                 = @GZIP@
-
-path_zcat                 = @ZCAT@
-
-path_gunzip               = @GUNZIP@
-
-path_lha                  = @LHA@
-
-path_ish                  = @ISH@
-
-path_bzip2                = @BZIP2@
-
-path_bunzip2              = @BUNZIP2@
-
-path_uuencode             = @UUENCODE@
-
-path_compress             = @COMPRESS@
-
-path_sendmail             = @SENDMAIL@
-
-path_nkf                  = @NKF@
-
-path_kakasi               = @KAKASI@
-
-path_namazu               = @NAMAZU@
-
-path_pgp                  = @PGP@
-
-path_pgp5                 = @PGP5@
-
-path_pgpe                 = @PGPe@
-
-path_pgpk                 = @PGPK@
-
-path_pgps                 = @PGPS@
-
-path_pgpv                 = @PGPV@
-
-path_gpg                  = @GPG@
-