Fix the previous test.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index a27a2772e2936e3297e65fc7437be762d67c81ee..22f29c1ed06c3f11a38a532900157a00b0e011ca 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -192,6 +192,7 @@ skeleton_find (const char *envvar, const char *skeleton_name)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)

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

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


@@ -204,7 +205,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);


@@ -417,15 +417,15 @@ compute_output_file_names (void)
 {
   compute_base_names ();
 
 {
   compute_base_names ();
 

-  parser_file_name =
-    spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension);
-

   /* If not yet done. */
   if (!src_extension)
     src_extension = ".c";
   if (!header_extension)
     header_extension = ".h";
   
   /* If not yet done. */
   if (!src_extension)
     src_extension = ".c";
   if (!header_extension)
     header_extension = ".h";
   

+  parser_file_name =
+    spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension);
+  

   /* It the defines filename if not given, we create it.  */
   if (!spec_defines_file)
     spec_defines_file = stringappend (full_base_name, header_extension);
   /* It the defines filename if not given, we create it.  */
   if (!spec_defines_file)
     spec_defines_file = stringappend (full_base_name, header_extension);