[lwatch-cvs] files ChangeLog,1.15,1.16 Makefile.in,1.18,1.19 README,1.14,1.15 TODO,1.17,1.18 configu
Brought to you by:
arturcz
|
From: <ar...@us...> - 2003-04-04 22:17:08
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv26204
Modified Files:
ChangeLog Makefile.in README TODO configure configure.ac
Log Message:
- docbook-utils support
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lwatch/files/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ChangeLog 4 Apr 2003 15:11:39 -0000 1.15
--- ChangeLog 4 Apr 2003 22:16:30 -0000 1.16
***************
*** 8,11 ****
--- 8,12 ----
- handle EOF - reopen fifo, close when input from stdin (arturcz)
- FreeBSD port (arturcz)
+ - support for docbook-utils
0.2: - bugfix: too much manual files installed (arturcz)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.in 24 Mar 2003 13:43:19 -0000 1.18
--- Makefile.in 4 Apr 2003 22:16:31 -0000 1.19
***************
*** 101,104 ****
--- 101,106 ----
datadir = @datadir@
dbook2man = @dbook2man@
+ dbook2man_out = @dbook2man_out@
+ dbook2man_out_in = @dbook2man_out_in@
exec_prefix = @exec_prefix@
host = @host@
Index: README
===================================================================
RCS file: /cvsroot/lwatch/files/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** README 4 Apr 2003 15:36:21 -0000 1.14
--- README 4 Apr 2003 22:16:31 -0000 1.15
***************
*** 27,32 ****
System manual has been written in SGML DocBook. You need some kind (any)
docbook->man converter to generate proper manual page. For now, configure
! supports only docbook-to-man available at:
http://www.oasis-open.org/docbook/tools/dtm/docbook-to-man.tar.gz
Log Watcher uses getopt_long function. Some unices have it included
--- 27,37 ----
System manual has been written in SGML DocBook. You need some kind (any)
docbook->man converter to generate proper manual page. For now, configure
! supports docbook-to-man available at:
http://www.oasis-open.org/docbook/tools/dtm/docbook-to-man.tar.gz
+ If not found configure tries to use docbook2man (from docbook-utils package).
+ You should know that docbook2man 0.6.12 produces manual file which looks
+ ugly: breaking spaces between arguments and square brackets. So you
+ can use it for yourself but DO NOT use it for packaging.
+ You have been warned.
Log Watcher uses getopt_long function. Some unices have it included
Index: TODO
===================================================================
RCS file: /cvsroot/lwatch/files/TODO,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TODO 4 Apr 2003 21:16:11 -0000 1.17
--- TODO 4 Apr 2003 22:16:31 -0000 1.18
***************
*** 3,7 ****
Now (for 0.3):
- - configure: docbook2man (docbook-utils) support
- full color support (dark and light colors)
--- 3,6 ----
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure 27 Mar 2003 16:08:16 -0000 1.34
--- configure 4 Apr 2003 22:16:32 -0000 1.35
***************
*** 311,315 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT SED dbook2man CPP EGREP LIBOBJS HAVE_D2M_TRUE HAVE_D2M_FALSE INPUTFILE LTLIBOBJS'
ac_subst_files=''
--- 311,315 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT SED dbook2man dbook2man_out dbook2man_out_in CPP EGREP LIBOBJS HAVE_D2M_TRUE HAVE_D2M_FALSE INPUTFILE LTLIBOBJS'
ac_subst_files=''
***************
*** 3241,3246 ****
if test "$dbook2man" = "no"; then
! { echo "$as_me:$LINENO: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&5
echo "$as_me: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&2;}
fi
--- 3241,3304 ----
if test "$dbook2man" = "no"; then
! unset ac_cv_path_dbook2man
! # Extract the first word of "docbook2man", so it can be a program name with args.
! set dummy docbook2man; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_path_dbook2man+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! case $dbook2man in
! [\\/]* | ?:[\\/]*)
! ac_cv_path_dbook2man="$dbook2man" # Let the user override the test with a path.
! ;;
! *)
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
! IFS=$as_save_IFS
! test -z "$as_dir" && as_dir=.
! for ac_exec_ext in '' $ac_executable_extensions; do
! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
! ac_cv_path_dbook2man="$as_dir/$ac_word$ac_exec_ext"
! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
! break 2
! fi
! done
! done
!
! test -z "$ac_cv_path_dbook2man" && ac_cv_path_dbook2man="no"
! ;;
! esac
! fi
! dbook2man=$ac_cv_path_dbook2man
!
! if test -n "$dbook2man"; then
! echo "$as_me:$LINENO: result: $dbook2man" >&5
! echo "${ECHO_T}$dbook2man" >&6
! else
! echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
!
! if test "$dbook2man" = "no"; then
! { echo "$as_me:$LINENO: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&5
echo "$as_me: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&2;}
+ else
+ dbook2man_out=""
+ dbook2man_out_in="&& mv -f lwatch.1 lwatch.1.in"
+ { echo "$as_me:$LINENO: WARNING: you could have bad formatted manual page, see README for details" >&5
+ echo "$as_me: WARNING: you could have bad formatted manual page, see README for details" >&2;}
+ sleep 5
+ fi
+ else
+ dbook2man_out="> lwatch.1"
+ dbook2man_out_in="> lwatch.1.in"
+ fi
+
+
+ if test "$dbook2man" != "no"; then
+ { echo "$as_me:$LINENO: sgml->man: ${dbook2man} lwatch.sgml ${dbook2man_out}" >&5
+ echo "$as_me: sgml->man: ${dbook2man} lwatch.sgml ${dbook2man_out}" >&6;}
fi
***************
*** 5693,5696 ****
--- 5751,5756 ----
s,@SED@,$SED,;t t
s,@dbook2man@,$dbook2man,;t t
+ s,@dbook2man_out@,$dbook2man_out,;t t
+ s,@dbook2man_out_in@,$dbook2man_out_in,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** configure.ac 27 Mar 2003 11:55:20 -0000 1.29
--- configure.ac 4 Apr 2003 22:16:34 -0000 1.30
***************
*** 58,62 ****
AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
if test "$dbook2man" = "no"; then
! AC_MSG_WARN([docbook-to-man not found, using lwatch.1.in stub])
fi
--- 58,79 ----
AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
if test "$dbook2man" = "no"; then
! unset ac_cv_path_dbook2man
! AC_PATH_PROG(dbook2man,[docbook2man],[no])
! if test "$dbook2man" = "no"; then
! AC_MSG_WARN([docbook-to-man not found, using lwatch.1.in stub])
! else
! dbook2man_out=""
! dbook2man_out_in="&& mv -f lwatch.1 lwatch.1.in"
! AC_MSG_WARN([you could have bad formatted manual page, see README for details])
! sleep 5
! fi
! else
! dbook2man_out="> lwatch.1"
! dbook2man_out_in="> lwatch.1.in"
! fi
! AC_SUBST(dbook2man_out)
! AC_SUBST(dbook2man_out_in)
! if test "$dbook2man" != "no"; then
! AC_MSG_NOTICE([sgml->man: ${dbook2man} lwatch.sgml ${dbook2man_out}])
fi
|