diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | doc/Makefile.sub | 22 | ||||
| -rw-r--r-- | doc/groff.texinfo | 2 |
7 files changed, 43 insertions, 21 deletions
@@ -1,3 +1,17 @@ +2005-11-18 Werner LEMBERG <wl@gnu.org> + + * aclocal.m4 (GROFF_MAKEINFO): Use `groff.info' in tests. + Announce makeinfo version. + * configure: Regenerated. + +2005-11-18 Mike Frysinger <vapier@gentoo.org> + + * Makefile.in: Declare proper dependencies between make targets. + + * doc/Makefile.in: Rename groff info page to `groff.info'. + * doc/Makefile.sub: Likewise. + * doc/groff.texinfo: Likewise. + 2005-11-17 Peter O'Gorman <mlists@thewrittenword.com> * src/utils/pfbtops/pfbtops.c, src/utils/xtotroff/xtotroff.c: Move diff --git a/Makefile.in b/Makefile.in index b8e77569..81e2e615 100644 --- a/Makefile.in +++ b/Makefile.in @@ -601,7 +601,7 @@ dot: FORCE -f $(top_srcdir)/Makefile.comm \ -f $(top_srcdir)/Makefile.sub $(do) -$(LIBDIRS): FORCE +$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ @@ -617,7 +617,7 @@ $(LIBDIRS): FORCE -f $(top_srcdir)/Makefile.lib \ -f Makefile.dep $(do) -$(CPROGDIRS): FORCE +$(CPROGDIRS): FORCE $(LIBDIRS) @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ @@ -633,7 +633,7 @@ $(CPROGDIRS): FORCE -f $(top_srcdir)/Makefile.cpg \ -f Makefile.dep $(do) -$(CCPROGDIRS): FORCE +$(CCPROGDIRS): FORCE $(LIBDIRS) @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ @@ -649,7 +649,7 @@ $(CCPROGDIRS): FORCE -f $(top_srcdir)/Makefile.ccpg \ -f Makefile.dep $(do) -$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE +$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS) @$(ENVSETUP); \ if test $(srcdir) = .; then \ srcdir=.; \ @@ -663,6 +663,8 @@ $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.dev $(do) +$(OTHERDIRS): $(PROGDIRS) + $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE @$(ENVSETUP); \ if test $(srcdir) = .; then \ @@ -65,9 +65,11 @@ AC_DEFUN([GROFF_MAKEINFO], if test -z "$MAKEINFO"; then missing="\`makeinfo' is missing." else + AC_MSG_CHECKING([for makeinfo version]) # We need an additional level of quoting to make sed's regexps work. [makeinfo_version=`$MAKEINFO --version 2>&1 \ | sed 's/^.* \([^ ]\+\)$/\1/;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/'`] @@ -96,8 +98,8 @@ AC_DEFUN([GROFF_MAKEINFO], fi if test -n "$missing"; then - if test ! -f doc/groff \ - || test ${srcdir}/doc/groff.texinfo -nt doc/groff; then + if test ! -f doc/groff.info \ + || test ${srcdir}/doc/groff.texinfo -nt doc/groff.info; then AC_MSG_ERROR($missing [Get the `texinfo' package version 4.8 or newer.]) else @@ -5503,9 +5503,13 @@ fi if test -z "$MAKEINFO"; then missing="\`makeinfo' is missing." else + echo "$as_me:$LINENO: checking for makeinfo version" >&5 +echo $ECHO_N "checking for makeinfo version... $ECHO_C" >&6 # We need an additional level of quoting to make sed's regexps work. makeinfo_version=`$MAKEINFO --version 2>&1 \ | sed 's/^.* \([^ ]\+\)$/\1/;1q'` + echo "$as_me:$LINENO: result: $makeinfo_version" >&5 +echo "${ECHO_T}$makeinfo_version" >&6 # Consider only the first two numbers in version number string. makeinfo_version_major=`echo $makeinfo_version \ | sed 's/^\([0-9]*\).*$/\1/'` @@ -5534,8 +5538,8 @@ fi fi if test -n "$missing"; then - if test ! -f doc/groff \ - || test ${srcdir}/doc/groff.texinfo -nt doc/groff; then + if test ! -f doc/groff.info \ + || test ${srcdir}/doc/groff.texinfo -nt doc/groff.info; then { { echo "$as_me:$LINENO: error: $missing Get the \`texinfo' package version 4.8 or newer." >&5 echo "$as_me: error: $missing diff --git a/doc/Makefile.in b/doc/Makefile.in index b48a6480..96f307e0 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -113,7 +113,7 @@ prepare_examples: grnexmpl.g groff.css test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g . test -f groff.css || cp $(srcdir)/groff.css . -groff: groff.texinfo +groff.info: groff.texinfo $(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo gnu.eps: gnu.xpm diff --git a/doc/Makefile.sub b/doc/Makefile.sub index a8fe0a7f..0e90c596 100644 --- a/doc/Makefile.sub +++ b/doc/Makefile.sub @@ -118,7 +118,7 @@ CLEANNOTSRCDIRADD=\ $(GROFF) -Tps -ms -mwww >$@ -all: groff $(PROCESSEDDOCFILES) prepare_examples \ +all: groff.info $(PROCESSEDDOCFILES) prepare_examples \ $(PROCESSEDEXAMPLEFILES) $(make_html) html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES) @@ -137,7 +137,7 @@ examples.stamp: grnexmpl.g groff.css gnu.eps fi echo timestamp > $@ -groff: groff.texinfo +groff.info: groff.texinfo $(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo gnu.eps: gnu.xpm @@ -157,20 +157,20 @@ webpage.ps: gnu.eps grnexmpl.ps: grnexmpl.me grnexmpl.g -distfiles: groff gnu.eps gnu.png +distfiles: groff.info gnu.eps gnu.png -install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ +install_data: groff.info $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) -test -d $(infodir) || $(mkinstalldirs) $(infodir) # Prefer info files in builddir over srcdir; we test for -# the existence of `groff'. +# the existence of `groff.info'. d=.; \ - test -f "groff" || d=$(srcdir); \ - for f in $$d/groff `ls $$d/groff-*`; do \ - rm -f $(infodir)/`basename $$f`; \ - $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \ + test -f "groff.info" || d=$(srcdir); \ + for f in $$d/groff.info `ls $$d/groff.info*`; do \ + rm -f $(infodir)/$$f; \ + $(INSTALL_DATA) $$f $(infodir)/$$f; \ done - $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff + $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff.info -test -d $(docdir) || $(mkinstalldirs) $(docdir) for f in $(DOCFILES); do \ rm -f $(docdir)/$$f; \ @@ -212,7 +212,7 @@ uninstall_sub: -for f in groff `ls groff-*`; do \ rm -f $(infodir)/$$f; \ done - $(INSTALL_INFO) --remove --info-dir=$(infodir) $(infodir)/groff + $(INSTALL_INFO) --remove --info-dir=$(infodir) $(infodir)/groff.info -for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \ rm -f $(docdir)/$$f; \ done diff --git a/doc/groff.texinfo b/doc/groff.texinfo index cc0ac7eb..f8cece1b 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -8,7 +8,7 @@ @c @c %**start of header (This is for running Texinfo on a region.) -@setfilename groff +@setfilename groff.info @settitle The GNU Troff Manual @setchapternewpage odd @footnotestyle separate |