* src/Makefile.am (INCLUDES): s/PFILE/BISON_SIMPLE/.

s/PFILE1/BISON_HAIRY/.
Adjust dependencies.

diff --git a/ChangeLog b/ChangeLog
index 53a4d3661a4a088771ed726a0e60712563ba3d13..4140230195c15fa1f964c90bf79c3bce8e140d51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-03  Akim Demaille  <akim@epita.fr>
+
+       * src/Makefile.am (INCLUDES): s/PFILE/BISON_SIMPLE/.
+       s/PFILE1/BISON_HAIRY/.
+       Adjust dependencies.
+
 2000-11-03  Akim Demaille  <akim@epita.fr>
 
        For some reasons, this has not been applied.

diff --git a/src/Makefile.am b/src/Makefile.am
index 53475eb92dd7067a0ef51832420dc1fa720a7f10..5b28d1c22b288e1f1d34b12ba0805c614a62a041 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,10 @@
 AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
 
 DEFS = @DEFS@ \
-  -DXPFILE=\"${datadir}/bison.simple\" \
-  -DXPFILE1=\"${datadir}/bison.hairy\" \
+  -DBISON_SIMPLE=\"${datadir}/bison.simple\" \
+  -DBISON_HAIRY=\"${datadir}/bison.hairy\" \
   -DLOCALEDIR=\"${datadir}/locale\"
+
 INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
 LDADD = @INTLLIBS@ ../lib/libbison.a
 

diff --git a/src/files.c b/src/files.c
index e0ac8f4e69647816ad91d53ce7af739f58ea90b3..5282ac0d199271ea0edd214773de077b7afdb5d0 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -22,20 +22,20 @@
 #include "system.h"
 
 #if defined (VMS) & !defined (__VMS_POSIX)
-# ifndef XPFILE
-#  define XPFILE "GNU_BISON:[000000]BISON.SIMPLE"
+# ifndef BISON_SIMPLE
+#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
 # endif
-# ifndef XPFILE1
-#  define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY"
+# ifndef BISON_HAIRY
+#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
 # endif
 #endif
 
 #if defined (_MSC_VER)
-# ifndef XPFILE
-#  define XPFILE "c:/usr/local/lib/bison.simple"
+# ifndef BISON_SIMPLE
+#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
 # endif
-# ifndef XPFILE1
-#  define XPFILE1 "c:/usr/local/lib/bison.hairy"
+# ifndef BISON_HAIRY
+#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
 # endif
 #endif
 
@@ -290,7 +290,7 @@ open_files (void)
   finput = xfopen (infile, "r");
 
   if (!no_parser_flag)
-    fparser = xfopen (skeleton_find ("BISON_SIMPLE", PFILE), "r");
+    fparser = xfopen (skeleton_find ("BISON_SIMPLE", BISON_SIMPLE), "r");
 
   if (verbose_flag)
     {
@@ -354,7 +354,7 @@ open_extra_files (void)
   xfclose (fparser);
 
   if (!no_parser_flag)
-    fparser = xfopen (skeleton_find ("BISON_HAIRY", PFILE1), "r");
+    fparser = xfopen (skeleton_find ("BISON_HAIRY", BISON_HAIRY), "r");
   fguard = xfopen (guardfile, "w");
 }
 

diff --git a/src/files.h b/src/files.h
index 961b3d4b0500cf6d6a48a7f1878820b7ae7d7ed5..33bed545fa265cb5a687b462fc20f5d8da7fa076 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -24,9 +24,6 @@
    When bison is installed, they should be absolute pathnames.
    XPFILE1 and XPFILE2 normally come from config.h.  */
 
-#define PFILE  XPFILE          /* Simple parser */
-#define PFILE1 XPFILE1         /* Semantic parser */
-
 /* File name specified with -o for the output file, or 0 if no -o.  */
 extern char *spec_outfile;