texinfo/makeinfo makeinfo.c,1.46,1.47

[karl]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv18136

Modified Files:
        makeinfo.c 
Log Message:
TEXINFO_OUTPUT -> TEXINFO_OUTPUT_FORMAT, after
discussion with tar maintainer.


Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** makeinfo.c  17 Feb 2004 16:59:46 -0000      1.46
--- makeinfo.c  24 Feb 2004 19:22:07 -0000      1.47
***************
*** 539,547 ****
  #endif
  
!   /* If TEXINFO_OUTPUT envvar is set, use it to set default output.
       Can be overridden with one of the output options.  */
!   if (getenv ("TEXINFO_OUTPUT") != NULL)
      {
!       if (STREQ (getenv ("TEXINFO_OUTPUT"), "docbook"))
          {
            splitting = 0;
--- 539,547 ----
  #endif
  
!   /* If TEXINFO_OUTPUT_FORMAT envvar is set, use it to set default output.
       Can be overridden with one of the output options.  */
!   if (getenv ("TEXINFO_OUTPUT_FORMAT") != NULL)
      {
!       if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "docbook"))
          {
            splitting = 0;
***************
*** 551,555 ****
            process_docbook = 1;
          }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT"), "html"))
          {
            html = 1;
--- 551,555 ----
            process_docbook = 1;
          }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "html"))
          {
            html = 1;
***************
*** 558,562 ****
            process_html = 1;
          }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT"), "plaintext"))
          {
            splitting = 0;
--- 558,568 ----
            process_html = 1;
          }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "info"))
!         {
!           html = 0;
!           docbook = 0;
!           xml = 0;
!         }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "plaintext"))
          {
            splitting = 0;
***************
*** 567,571 ****
            process_plaintext = 1;
          }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT"), "xml"))
          {
            splitting = 0;
--- 573,577 ----
            process_plaintext = 1;
          }
!       else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "xml"))
          {
            splitting = 0;
***************
*** 577,582 ****
        else
          fprintf (stderr,
!                  _("%s: Ignoring unrecognized TEXINFO_OUTPUT value `%s'.\n"),
!                  progname, getenv ("TEXINFO_OUTPUT"));
      }
  
--- 583,588 ----
        else
          fprintf (stderr,
!             _("%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value 
`%s'.\n"),
!                  progname, getenv ("TEXINFO_OUTPUT_FORMAT"));
      }