apply configure for fml/bin/

10 files changed, 62 insertions, 39 deletions

diff --git a/INSTALL.sh b/INSTALL.sh
index 09ff80e7..5e7df082 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -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.29 2001/11/08 03:38:21 fukachan Exp $
+# $FML: INSTALL.sh,v 1.30 2001/11/12 15:03:34 fukachan Exp $
 #
 
 # Run this from the top-level fml source directory.
@@ -76,6 +76,7 @@ for prog in fmldoc fmlthread fmlconf makefml fmlsch fmlhtmlify
 do
 	echo update ${bindir}/$prog
 	cp fml/bin/$prog ${bindir}/$prog.new
+	chmod 755 ${bindir}/$prog.new
 	mv ${bindir}/$prog.new ${bindir}/$prog
 done
 
diff --git a/configure b/configure
index a2469761..01f952aa 100755
--- a/configure
+++ b/configure
@@ -716,7 +716,17 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "config.sh fml/libexec/loader fml/etc/main.cf" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "\
+	config.sh \
+	fml/libexec/loader \
+	fml/etc/main.cf \
+	fml/bin/fmlconf \
+	fml/bin/fmldoc \
+	fml/bin/fmlhtmlify \
+	fml/bin/fmlsch \
+	fml/bin/fmlthread \
+	fml/bin/makefml \
+	" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -791,7 +801,17 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"config.sh fml/libexec/loader fml/etc/main.cf"}
+CONFIG_FILES=\${CONFIG_FILES-"\
+	config.sh \
+	fml/libexec/loader \
+	fml/etc/main.cf \
+	fml/bin/fmlconf \
+	fml/bin/fmldoc \
+	fml/bin/fmlhtmlify \
+	fml/bin/fmlsch \
+	fml/bin/fmlthread \
+	fml/bin/makefml \
+	"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -857,6 +877,7 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+
 if test -f fml/libexec/loader ; then
    chmod 755 fml/libexec/loader
 fi
diff --git a/configure.in b/configure.in
index c6bbdc03..aed5fc90 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION($FML: configure.in,v 1.1 2001/11/12 13:26:00 fukachan Exp $)
+AC_REVISION($FML: configure.in,v 1.2 2001/11/12 14:34:16 fukachan Exp $)
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(fml/libexec/loader.in)
@@ -18,7 +18,18 @@ AC_PATH_PROG(PERL, perl)
 
 AC_SUBST(SHELL)
 
-AC_OUTPUT(config.sh fml/libexec/loader fml/etc/main.cf)
+AC_OUTPUT(\
+	config.sh \
+	fml/libexec/loader \
+	fml/etc/main.cf \
+	fml/bin/fmlconf \
+	fml/bin/fmldoc \
+	fml/bin/fmlhtmlify \
+	fml/bin/fmlsch \
+	fml/bin/fmlthread \
+	fml/bin/makefml \
+	)
+
 if test -f fml/libexec/loader ; then
    chmod 755 fml/libexec/loader
 fi
diff --git a/fml/bin/fmlconf b/fml/bin/fmlconf.in
index 7a9c0b6a..7c9e5735 100755
--- a/fml/bin/fmlconf
+++ b/fml/bin/fmlconf.in
@@ -4,11 +4,12 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML$
+# $FML: fmlconf,v 1.2 2001/08/19 16:08:54 fukachan Exp $
 #
 
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexec_dir=@libexecdir@/fml
 
 exec $libexec_dir/fmlconf $*
 
diff --git a/fml/bin/fmldoc b/fml/bin/fmldoc.in
index 1644ae8a..b186cf8f 100755
--- a/fml/bin/fmldoc
+++ b/fml/bin/fmldoc.in
@@ -4,11 +4,12 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML$
+# $FML: fmldoc,v 1.2 2001/08/19 16:08:54 fukachan Exp $
 #
 
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexec_dir=@libexecdir@/fml
 
 exec $libexec_dir/fmldoc $*
 
diff --git a/fml/bin/fmlhtmlify b/fml/bin/fmlhtmlify.in
index 696b79a1..e46c71c0 100755
--- a/fml/bin/fmlhtmlify
+++ b/fml/bin/fmlhtmlify.in
@@ -4,11 +4,12 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: fmlthread,v 1.1 2001/11/03 12:23:14 fukachan Exp $
+# $FML: fmlhtmlify,v 1.2 2001/08/19 16:08:54 fukachan Exp $
 #
 
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexec_dir=@libexecdir@/fml
 
 exec $libexec_dir/fmlhtmlify $*
 
diff --git a/fml/bin/fmlsch b/fml/bin/fmlsch.in
index e144857c..cc00e14b 100755
--- a/fml/bin/fmlsch
+++ b/fml/bin/fmlsch.in
@@ -4,11 +4,12 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML$
+# $FML: fmlsch,v 1.2 2001/08/19 16:08:54 fukachan Exp $
 #
 
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexec_dir=@libexecdir@/fml
 
 exec $libexec_dir/fmlsch $*
 
diff --git a/fml/bin/fmlthread b/fml/bin/fmlthread.in
index 2ea0b9c3..8213134b 100755
--- a/fml/bin/fmlthread
+++ b/fml/bin/fmlthread.in
@@ -4,11 +4,12 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: fmlticket,v 1.2 2001/08/19 16:08:54 fukachan Exp $
+# $FML: fmlthread,v 1.2 2001/08/19 16:08:54 fukachan Exp $
 #
 
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexec_dir=@libexecdir@/fml
 
 exec $libexec_dir/fmlthread $*
 
diff --git a/fml/bin/fmlticket b/fml/bin/fmlticket
deleted file mode 100755
index 2ea0b9c3..00000000
--- a/fml/bin/fmlticket
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-#  Copyright (C) 2001 Ken'ichi Fukamachi
-#   All rights reserved. This program is free software; you can
-#   redistribute it and/or modify it under the same terms as Perl itself. 
-#
-# $FML: fmlticket,v 1.2 2001/08/19 16:08:54 fukachan Exp $
-#
-
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
-
-exec $libexec_dir/fmlthread $*
-
-echo 'not reach here'
-exit 0;
diff --git a/fml/bin/makefml b/fml/bin/makefml.in
index 905e72b2..63e3cc96 100755
--- a/fml/bin/makefml
+++ b/fml/bin/makefml.in
@@ -4,11 +4,12 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML$
+# $FML: makefml,v 1.2 2001/08/19 16:08:54 fukachan Exp $
 #
 
-default_prefix=/usr/local
-libexec_dir=$default_prefix/libexec/fml
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexec_dir=@libexecdir@/fml
 
 exec $libexec_dir/makefml $*