Regen.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index c11420c838e13c05a7aebe44c73cde7b7e6fb222..83c863ffcaa9b1465a35d00706f2999cf58e713c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -214,7 +214,8 @@ skeleton_find (const char *envvar, const char *skeleton_name)
 {
   const char *res = getenv (envvar);
 
 {
   const char *res = getenv (envvar);
 

-#if defined (MSDOS) || defined (_WIN32)
+#if (defined (MSDOS) && !defined(__DJGPP__)) || defined (_WIN32)
+  const char *cp = getenv ("INIT");

   if (!res)
     {
       /* Skeleton file name without path */
   if (!res)
     {
       /* Skeleton file name without path */


@@ -227,7 +228,6 @@ skeleton_find (const char *envvar, const char *skeleton_name)
         ++skel_name;
 
       /* File doesn't exist in current directory; try in INIT directory.  */
         ++skel_name;
 
       /* File doesn't exist in current directory; try in INIT directory.  */

-      const char *cp = getenv ("INIT");

       if (cp)
        {
          res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);
       if (cp)
        {
          res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);


@@ -249,7 +249,7 @@ skeleton_find (const char *envvar, const char *skeleton_name)
          strcpy (res + (cp - program_name), skel_name);
        }
     }
          strcpy (res + (cp - program_name), skel_name);
        }
     }

-#endif /* defined (MSDOS) || defined (_WIN32) */
+#endif /* (defined (MSDOS) && !defined (__DJGPP__)) || defined (_WIN32) */

   if (!res)
     res = skeleton_name;
 
   if (!res)
     res = skeleton_name;
 


@@ -419,8 +419,9 @@ compute_base_names (void)
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);

-      if (ext)
-       compute_exts_from_gf (ext);
+      
+      if (ext && !yacc_flag)
+       compute_exts_from_gf (ext);

     }
 }
 
     }
 }
 


@@ -451,9 +452,7 @@ compute_output_file_names (void)
   spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
 
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);
   spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
 
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);

-#ifndef MSDOS
-  attrsfile = stringappend (attrsfile, header_extension);
-#endif /* MSDOS */
+  attrsfile = stringappend (attrsfile, EXT_TYPE (header_extension));

 
 }
 
 
 }
 


@@ -522,9 +521,7 @@ output_files (void)
       obstack_save (&attrs_obstack, attrsfile);
       obstack_free (&attrs_obstack, NULL);
       temp_name = stringappend (short_base_name, EXT_GUARD_C);
       obstack_save (&attrs_obstack, attrsfile);
       obstack_free (&attrs_obstack, NULL);
       temp_name = stringappend (short_base_name, EXT_GUARD_C);

-#ifndef MSDOS
-      temp_name = stringappend (temp_name, src_extension);
-#endif /* MSDOS */
+      temp_name = stringappend (temp_name, EXT_TYPE (src_extension));

       obstack_save (&guard_obstack, temp_name);
       obstack_free (&guard_obstack, NULL);
     }
       obstack_save (&guard_obstack, temp_name);
       obstack_free (&guard_obstack, NULL);
     }