[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ChangeLog m4/groff.m4
From: |
Keith Marshall |
Subject: |
[Groff-commit] groff ChangeLog m4/groff.m4 |
Date: |
Fri, 18 Aug 2006 19:21:57 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Keith Marshall <keithmarshall> 06/08/18 19:21:57
Modified files:
. : ChangeLog
m4 : groff.m4
Log message:
* m4/groff.m4 (GROFF_MAKEINFO): Correct `makeinfo version
testing
logic; it previously caused an `expr' syntax error, if no
version of
`makinfo' was present. Also, remove dependency on `makeinfo'
in VPATH
builds, if an up to date `groff.info' is present in either
`builddir'
or in `srcdir'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.982&r2=1.983
http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.2&r2=1.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -b -r1.982 -r1.983
--- ChangeLog 13 Aug 2006 12:37:19 -0000 1.982
+++ ChangeLog 18 Aug 2006 19:21:56 -0000 1.983
@@ -1,3 +1,11 @@
+2006-08-18 Keith Marshall <address@hidden>
+
+ * m4/groff.m4 (GROFF_MAKEINFO): Correct `makeinfo version testing
+ logic; it previously caused an `expr' syntax error, if no version of
+ `makinfo' was present. Also, remove dependency on `makeinfo' in VPATH
+ builds, if an up to date `groff.info' is present in either `builddir'
+ or in `srcdir'.
+
2006-08-12 Tadziu Hoffmann <address@hidden>
* font/devps/prologue.ps: Add BPhook.
Index: m4/groff.m4
===================================================================
RCS file: /cvsroot/groff/groff/m4/groff.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- m4/groff.m4 26 Feb 2006 14:03:25 -0000 1.2
+++ m4/groff.m4 18 Aug 2006 19:21:57 -0000 1.3
@@ -71,35 +71,20 @@
| sed -e 's/^.* \([^ ][^ ]*\)$/\1/' -e '1q'`]
AC_MSG_RESULT([$makeinfo_version])
# Consider only the first two numbers in version number string.
- [makeinfo_version_major=`echo $makeinfo_version \
- | sed 's/^\([0-9]*\).*$/\1/'`]
- if test -z "$makeinfo_version_major"; then
- makeinfo_version_major=0
- makeinfo_version_minor=0
- else
- [makeinfo_version_minor=`echo $makeinfo_version \
- | sed 's/^[^.][^.]*\(.*\)$/\1/'`]
- # No minor version number at all?
- if test -z "$makeinfo_version_minor"; then
- makeinfo_version_minor=0
- else
- [makeinfo_version_minor=`echo $makeinfo_version_minor \
- | sed 's/\.\([0-9]*\).*$/\1/'`]
- if test -z "$makeinfo_version_minor"; then
- makeinfo_version_minor=0
- fi
- fi
- fi
- fi
- makeinfo_version_numeric=`expr $makeinfo_version_major '*' 1000 \
- '+' $makeinfo_version_minor`
+ makeinfo_version_major=`IFS=.; set x $makeinfo_version; echo 0${2}`
+ makeinfo_version_minor=`IFS=.; set x $makeinfo_version; echo 0${3}`
+ makeinfo_version_numeric=`
+ expr ${makeinfo_version_major}000 \+ ${makeinfo_version_minor}`
if test $makeinfo_version_numeric -lt 4008; then
missing="\`makeinfo' is too old."
fi
+ fi
if test -n "$missing"; then
- if test ! -f doc/groff.info \
- || test ${srcdir}/doc/groff.texinfo -nt doc/groff.info; then
+ infofile=doc/groff.info
+ test -f ${infofile} || infofile=${srcdir}/${infofile}
+ if test ! -f ${infofile} \
+ || test ${srcdir}/doc/groff.texinfo -nt ${infofile}; then
AC_MSG_ERROR($missing
[Get the `texinfo' package version 4.8 or newer.])
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ChangeLog m4/groff.m4,
Keith Marshall <=