Re: Texinfo 4.5, makeinfo --html: not using subdirs

[Karl Berry]

Here's a patch for the weird makeinfo behavior of not creating the
subdir if the current dir happened to be named the `right' thing.  The
code was only inserting the subdirectory conditionally; I just made it
always do so.

Thanks again for the report.


*** makeinfo.c.~1.19.~  Mon Feb 24 06:37:33 2003
--- makeinfo.c  Wed Mar  5 15:56:17 2003
***************
*** 1348,1362 ****
      *p = 0;
  
    /* Split html output goes into subdirectory of toplevel name. */
!   subdir = "";
!   if (FILENAME_CMP (base, filename_part (dir)) != 0)
!     {
!       if (save_command_output_filename
!           && STREQ (output_filename, save_command_output_filename))
!         subdir = basename;  /* from user, use unchanged */
!       else
!         subdir = base;      /* implicit, omit suffix */
!     }
  
    free (output_filename);
    output_filename = xmalloc (strlen (dir) + 1
--- 1348,1358 ----
      *p = 0;
  
    /* Split html output goes into subdirectory of toplevel name. */
!   if (save_command_output_filename
!       && STREQ (output_filename, save_command_output_filename))
!     subdir = basename;  /* from user, use unchanged */
!   else
!     subdir = base;      /* implicit, omit suffix */
  
    free (output_filename);
    output_filename = xmalloc (strlen (dir) + 1