[Groff-commit] groff ./ChangeLog ./Makefile.in ./aclocal.m4 ./...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/11/18 21:12:56

Modified files:
        .              : ChangeLog Makefile.in aclocal.m4 configure 
        doc            : Makefile.in Makefile.sub groff.texinfo 

Log message:
        * aclocal.m4 (GROFF_MAKEINFO): Use `groff.info' in tests.
        Announce makeinfo version.
        * configure: Regenerated.
        
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.859&tr2=1.860&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/aclocal.m4.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.in.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/groff.texinfo.diff?tr1=1.223&tr2=1.224&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.859 groff/ChangeLog:1.860
--- groff/ChangeLog:1.859       Wed Nov 16 18:09:03 2005
+++ groff/ChangeLog     Fri Nov 18 21:12:56 2005
@@ -1,3 +1,17 @@
+2005-11-18  Werner LEMBERG  <address@hidden>
+
+       * aclocal.m4 (GROFF_MAKEINFO): Use `groff.info' in tests.
+       Announce makeinfo version.
+       * configure: Regenerated.
+
+2005-11-18  Mike Frysinger <address@hidden>
+
+       * 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  <address@hidden>
 
        * src/utils/pfbtops/pfbtops.c, src/utils/xtotroff/xtotroff.c: Move
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.87 groff/Makefile.in:1.88
--- groff/Makefile.in:1.87      Thu Oct 27 21:30:30 2005
+++ groff/Makefile.in   Fri Nov 18 21:12:56 2005
@@ -601,7 +601,7 @@
          -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 @@
          -f $(top_srcdir)/Makefile.lib \
          -f Makefile.dep $(do)
 
-$(CPROGDIRS): FORCE
+$(CPROGDIRS): FORCE $(LIBDIRS)
        @$(ENVSETUP); \
        if test $(srcdir) = .; then \
          srcdir=.; \
@@ -633,7 +633,7 @@
          -f $(top_srcdir)/Makefile.cpg \
          -f Makefile.dep $(do)
 
-$(CCPROGDIRS): FORCE
+$(CCPROGDIRS): FORCE $(LIBDIRS)
        @$(ENVSETUP); \
        if test $(srcdir) = .; then \
          srcdir=.; \
@@ -649,7 +649,7 @@
          -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=.; \
@@ -662,6 +662,8 @@
          -f $(top_srcdir)/Makefile.comm \
          -f $$srcdir/Makefile.sub \
          -f $(top_srcdir)/Makefile.dev $(do)
+
+$(OTHERDIRS): $(PROGDIRS)
 
 $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
        @$(ENVSETUP); \
Index: groff/aclocal.m4
diff -u groff/aclocal.m4:1.51 groff/aclocal.m4:1.52
--- groff/aclocal.m4:1.51       Fri Nov  4 15:38:22 2005
+++ groff/aclocal.m4    Fri Nov 18 21:12:56 2005
@@ -65,9 +65,11 @@
    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 @@
    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
Index: groff/configure
diff -u groff/configure:1.70 groff/configure:1.71
--- groff/configure:1.70        Fri Nov  4 15:38:23 2005
+++ groff/configure     Fri Nov 18 21:12:56 2005
@@ -5503,9 +5503,13 @@
    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
 
    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
Index: groff/doc/Makefile.in
diff -u groff/doc/Makefile.in:1.18 groff/doc/Makefile.in:1.19
--- groff/doc/Makefile.in:1.18  Thu Oct 27 21:30:30 2005
+++ groff/doc/Makefile.in       Fri Nov 18 21:12:56 2005
@@ -113,7 +113,7 @@
        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
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.22 groff/doc/Makefile.sub:1.23
--- groff/doc/Makefile.sub:1.22 Thu Oct 27 21:30:30 2005
+++ groff/doc/Makefile.sub      Fri Nov 18 21:12:56 2005
@@ -118,7 +118,7 @@
        $(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 @@
        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 @@
 
 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 @@
        -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
Index: groff/doc/groff.texinfo
diff -u groff/doc/groff.texinfo:1.223 groff/doc/groff.texinfo:1.224
--- groff/doc/groff.texinfo:1.223       Sun Oct 30 22:21:59 2005
+++ groff/doc/groff.texinfo     Fri Nov 18 21:12:56 2005
@@ -8,7 +8,7 @@
 @c
 
 @c %**start of header (This is for running Texinfo on a region.)
address@hidden groff
address@hidden groff.info
 @settitle The GNU Troff Manual
 @setchapternewpage odd
 @footnotestyle separate