* tests/testsuite.at (AT_CHECK): When checking if $1 starts with

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 6b62ccd617aeb79e17d5e7731d2c8c6021176152..1e130dfc18a6713bdc42c8a8c2650b5aabf21f73 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -603,6 +603,8 @@ prepare (void)
   if (spec_name_prefix)
     MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 
   if (spec_name_prefix)
     MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 

+  MUSCLE_INSERT_STRING ("file_name_all_but_ext", all_but_ext);
+

 #define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "")
   DEFINE (dir_prefix);
   DEFINE (parser_file_name);
 #define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "")
   DEFINE (dir_prefix);
   DEFINE (parser_file_name);


@@ -632,7 +634,11 @@ prepare (void)
   /* About the skeletons. */
   {
     char const *pkgdatadir = getenv ("BISON_PKGDATADIR");
   /* About the skeletons. */
   {
     char const *pkgdatadir = getenv ("BISON_PKGDATADIR");

-    MUSCLE_INSERT_STRING ("pkgdatadir", pkgdatadir ? pkgdatadir : PKGDATADIR);
+    /* b4_pkgdatadir is used inside m4_include in the skeletons, so digraphs
+       would never be expanded.  Hopefully no one has M4-special characters in
+       his Bison installation path.  */
+    MUSCLE_INSERT_STRING_RAW ("pkgdatadir",
+                              pkgdatadir ? pkgdatadir : PKGDATADIR);

     MUSCLE_INSERT_C_STRING ("skeleton", skeleton);
   }
 }
     MUSCLE_INSERT_C_STRING ("skeleton", skeleton);
   }
 }