summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2008-08-29 13:02:33 +0000
committerPeter Eisentraut <peter_e@gmx.net>2008-08-29 13:02:33 +0000
commit7c31742a07c7fa311b0c78c598066944db1ca900 (patch)
tree2e5bb15af28c1c326eaba4c383ab973530273ee6 /doc/src
parenta2794623d292f7bbfe3134d1407281055acce584 (diff)
Remove all traces that suggest that a non-Bison yacc might be supported, and
change build system to use only Bison. Simplify build rules, make file names uniform. Don't build the token table header file where it is not needed.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/installation.sgml38
1 files changed, 24 insertions, 14 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index c787a313882..a5dfa8d0810 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.311 2008/07/23 17:07:50 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.312 2008/08/29 13:02:32 petere Exp $ -->
<chapter id="installation">
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -277,6 +277,9 @@ su - postgres
<primary>flex</primary>
</indexterm>
<indexterm>
+ <primary>lex</primary>
+ </indexterm>
+ <indexterm>
<primary>bison</primary>
</indexterm>
<indexterm>
@@ -287,10 +290,8 @@ su - postgres
are needed to build a CVS checkout or if you changed the actual
scanner and parser definition files. If you need them, be sure
to get <application>Flex</> 2.5.4 or later and
- <application>Bison</> 1.875 or later. Other <application>yacc</>
- programs can sometimes be used, but doing so requires extra
- effort and is not recommended. Other <application>lex</>
- programs will definitely not work.
+ <application>Bison</> 1.875 or later. Other <application>lex</>
+ and <application>yacc</> programs cannot be used.
</para>
</listitem>
</itemizedlist>
@@ -1342,6 +1343,15 @@ su - postgres
<variablelist>
<varlistentry>
+ <term><envar>BISON</envar></term>
+ <listitem>
+ <para>
+ Bison program
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><envar>CC</envar></term>
<listitem>
<para>
@@ -1396,6 +1406,15 @@ su - postgres
</varlistentry>
<varlistentry>
+ <term><envar>FLEX</envar></term>
+ <listitem>
+ <para>
+ Flex program
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><envar>LDFLAGS</envar></term>
<listitem>
<para>
@@ -1462,15 +1481,6 @@ su - postgres
</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><envar>YACC</envar></term>
- <listitem>
- <para>
- Yacc program (<literal>bison -y</literal> if using Bison)
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</para>
</step>