🌐 AI搜索 & 代理 主页
Skip to content

Commit 033cb9d

Browse files
peterepetere
committed
Fix list of environment variables for configure. Remove some variables
that are almost never used. Put documentation-related variables into the documentation chapter.
1 parent a09f9ff commit 033cb9d

File tree

2 files changed

+43
-180
lines changed

2 files changed

+43
-180
lines changed

‎doc/src/sgml/docguide.sgml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.57 2006/09/16 00:30:12 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.58 2006/10/23 14:13:43 petere Exp $ -->
22

33
<appendix id="docguide">
44
<title>Documentation</title>
@@ -502,12 +502,15 @@ checking for sgmlspl... sgmlspl
502502
If neither <filename>onsgmls</filename> nor
503503
<filename>nsgmls</filename> were found then you will not see the
504504
remaining 4 lines. <filename>nsgmls</filename> is part of the Jade
505-
package. If <quote>DocBook V4.2</quote> was not found then you did
506-
not install the DocBook DTD kit in a place where jade can find it,
507-
or you have not set up the catalog files correctly. See the
508-
installation hints above. The DocBook stylesheets are looked for
509-
in a number of relatively standard places, but if you have them
510-
some other place then you should set the environment variable
505+
package. You can pass the environment variables
506+
<envar>JADE</envar> and <envar>NSGMLS</envar> to configure to point
507+
to the programs if they are not found automatically. If
508+
<quote>DocBook V4.2</quote> was not found then you did not install
509+
the DocBook DTD kit in a place where Jade can find it, or you have
510+
not set up the catalog files correctly. See the installation hints
511+
above. The DocBook stylesheets are looked for in a number of
512+
relatively standard places, but if you have them some other place
513+
then you should set the environment variable
511514
<envar>DOCBOOKSTYLE</envar> to the location and rerun
512515
<filename>configure</filename> afterwards.
513516
</para>

‎doc/src/sgml/installation.sgml‎

Lines changed: 33 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.264 2006/10/12 18:49:32 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.265 2006/10/23 14:13:43 petere Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1064,269 +1064,129 @@ su - postgres
10641064
</para>
10651065

10661066
<para>
1067-
Here's a list of the significant environment variables:
1068-
</para>
1069-
1070-
<para>
1067+
Here is a list of the significant variables that can be set in
1068+
this manner:
1069+
10711070
<variablelist>
1072-
1073-
<varlistentry>
1074-
<term><option>AWK=<replaceable>/path/to/awk</></option></term>
1075-
<listitem>
1076-
<para>
1077-
<replaceable>/path/to/awk</> is the full path to <application>awk</>.
1078-
</para>
1079-
</listitem>
1080-
</varlistentry>
1081-
1082-
<varlistentry>
1083-
<term><option>CC=<replaceable>/path/to/cc</></option></term>
1084-
<listitem>
1085-
<para>
1086-
<replaceable>/path/to/cc</> is the full path to your C compiler, such
1087-
as <application>gcc</>.
1088-
</para>
1089-
</listitem>
1090-
</varlistentry>
1091-
1092-
<varlistentry>
1093-
<term><option>CFLAGS=<replaceable>FLAGS</></option></term>
1094-
<listitem>
1095-
<para>
1096-
<replaceable>FLAGS</> is the a list of flags to pass to the C
1097-
compiler.
1098-
</para>
1099-
</listitem>
1100-
</varlistentry>
1101-
1102-
<varlistentry>
1103-
<term><option>COLLATEINDEX</option></term>
1104-
<listitem>
1105-
<para>
1106-
Used for building the SGML documentation.
1107-
</para>
1108-
</listitem>
1109-
</varlistentry>
1110-
1111-
<varlistentry>
1112-
<term><option>CPP=<replaceable>/path/to/cpp</></option></term>
1113-
<listitem>
1114-
<para>
1115-
<replaceable>/path/to/cpp</> is the full path to your C preprocessor,
1116-
such as <application>gcc</>.
1117-
</para>
1118-
</listitem>
1119-
</varlistentry>
1120-
11211071
<varlistentry>
1122-
<term><option>CPPFLAGS=<replaceable>FLAGS</></option></term>
1072+
<term><envar>CC</envar></term>
11231073
<listitem>
11241074
<para>
1125-
<replaceable>FLAGS</> is the a list of flags to pass to the C
1126-
preprocessor.
1075+
C compiler
11271076
</para>
11281077
</listitem>
11291078
</varlistentry>
11301079

11311080
<varlistentry>
1132-
<term><option>DOCBOOKSTYLE</option></term>
1081+
<term><envar>CFLAGS</envar></term>
11331082
<listitem>
11341083
<para>
1135-
Used for building the SGML documentation.
1084+
options to pass to the C compiler
11361085
</para>
11371086
</listitem>
11381087
</varlistentry>
11391088

11401089
<varlistentry>
1141-
<term><option>DTRACE=<replaceable>/path/to/dtrace</></option></term>
1090+
<term><envar>CPP</envar></term>
11421091
<listitem>
11431092
<para>
1144-
Specifies the location of the <command>dtrace</command> program.
1093+
C preprocessor
11451094
</para>
11461095
</listitem>
11471096
</varlistentry>
11481097

11491098
<varlistentry>
1150-
<term><option>DTRACEFLAGS=<replaceable>FLAGS</></option></term>
1099+
<term><envar>CPPFLAGS</envar></term>
11511100
<listitem>
11521101
<para>
1153-
<replaceable>FLAGS</> is the a list of flags to pass to the
1154-
<command>dtrace</command> program.
1102+
options to pass to the C preprocessor
11551103
</para>
11561104
</listitem>
11571105
</varlistentry>
11581106

11591107
<varlistentry>
1160-
<term><option>JADE</option></term>
1108+
<term><envar>DTRACE</envar></term>
11611109
<listitem>
11621110
<para>
1163-
Used for building the SGML documentation.
1111+
location of the <command>dtrace</command> program
11641112
</para>
11651113
</listitem>
11661114
</varlistentry>
11671115

11681116
<varlistentry>
1169-
<term><option>LDFLAGS=<replaceable>FLAGS</></option></term>
1117+
<term><envar>DTRACEFLAGS</envar></term>
11701118
<listitem>
11711119
<para>
1172-
<replaceable>FLAGS</> is the a list of flags to pass to the link file
1173-
editor.
1120+
options to pass to the <command>dtrace</command> program
11741121
</para>
11751122
</listitem>
11761123
</varlistentry>
11771124

11781125
<varlistentry>
1179-
<term><option>LDFLAGS_SL</option></term>
1126+
<term><envar>LDFLAGS</envar></term>
11801127
<listitem>
11811128
<para>
1182-
Used for shared library linking.
1129+
options to pass to the link editor
11831130
</para>
11841131
</listitem>
11851132
</varlistentry>
11861133

11871134
<varlistentry>
1188-
<term><option>LORDER=<replaceable>/path/to/lorder</></option></term>
1135+
<term><envar>LDFLAGS_SL</envar></term>
11891136
<listitem>
11901137
<para>
1191-
<replaceable>/path/to/lorder</> is the full path to your dependency
1192-
listing program.
1138+
linker options for shared library linking
11931139
</para>
11941140
</listitem>
11951141
</varlistentry>
11961142

11971143
<varlistentry>
1198-
<term><option>MSGFMT</option></term>
1144+
<term><envar>MSGFMT</envar></term>
11991145
<listitem>
12001146
<para>
1201-
Used for Native Language Support (NLS).
1147+
<command>msgfmt</command> program for native language support
12021148
</para>
12031149
</listitem>
12041150
</varlistentry>
12051151

12061152
<varlistentry>
1207-
<term><option>MSGMERGE</option></term>
1153+
<term><envar>PERL</envar></term>
12081154
<listitem>
12091155
<para>
1210-
Used for Native Language Support (NLS).
1156+
Full path to the Perl interpreter. This will be used to
1157+
determine the dependencies for building PL/Perl.
12111158
</para>
12121159
</listitem>
12131160
</varlistentry>
12141161

12151162
<varlistentry>
1216-
<term><option>NSGMLS</option></term>
1163+
<term><envar>PYTHON</envar></term>
12171164
<listitem>
12181165
<para>
1219-
Used for building the SGML documentation.
1166+
Full path to the Python interpreter. This will be used to
1167+
determine the dependencies for building PL/Python.
12201168
</para>
12211169
</listitem>
12221170
</varlistentry>
12231171

12241172
<varlistentry>
1225-
<term><option>PERL=<replaceable>/path/to/perl</></option></term>
1173+
<term><envar>TCLSH</envar></term>
12261174
<listitem>
12271175
<para>
1228-
<replaceable>/path/to/perl</> is the full path to your Perl 5
1229-
interpreter. Note that this wil be used to determine the dependencies
1230-
for building PL/Perl.
1176+
Full path to the Tcl interpreter. This wil be used to
1177+
determine the dependencies for building PL/Tcl.
12311178
</para>
12321179
</listitem>
12331180
</varlistentry>
12341181

12351182
<varlistentry>
1236-
<term><option>PTHREAD_CC</option></term>
1183+
<term><envar>YACC</envar></term>
12371184
<listitem>
12381185
<para>
1239-
Used for adding thread-safety flags.
1186+
Yacc program (<literal>bison -y</literal> if using Bison)
12401187
</para>
12411188
</listitem>
12421189
</varlistentry>
1243-
1244-
<varlistentry>
1245-
<term><option>PYTHON=<replaceable>/path/to/python</></option></term>
1246-
<listitem>
1247-
<para>
1248-
<replaceable>/path/to/python</> is the full path to your Python
1249-
interpreter. Note that this wil be used to determine the dependencies
1250-
for building PL/Python.
1251-
</para>
1252-
</listitem>
1253-
</varlistentry>
1254-
1255-
<varlistentry>
1256-
<term><option>RANLIB=<replaceable>/path/to/ranlib</></option></term>
1257-
<listitem>
1258-
<para>
1259-
<replaceable>/path/to/ranlib</> is the full path to your archive
1260-
library table of contents editor.
1261-
</para>
1262-
</listitem>
1263-
</varlistentry>
1264-
1265-
<varlistentry>
1266-
<term><option>SGMLSPL</option></term>
1267-
<listitem>
1268-
<para>
1269-
Used for building the SGML documentation.
1270-
</para>
1271-
</listitem>
1272-
</varlistentry>
1273-
1274-
<varlistentry>
1275-
<term><option>STRIP=<replaceable>/path/to/strip</></option></term>
1276-
<listitem>
1277-
<para>
1278-
<replaceable>/path/to/strip</> is the full path to your strip program.
1279-
</para>
1280-
</listitem>
1281-
</varlistentry>
1282-
1283-
<varlistentry>
1284-
<term><option>TCL=<replaceable>/path/to/tcl</></option></term>
1285-
<listitem>
1286-
<para>
1287-
<replaceable>/path/to/tcl</> is the full path to your TCL
1288-
interpreter. Note that this wil be used to determine the dependencies
1289-
for building PL/TCL.
1290-
</para>
1291-
</listitem>
1292-
</varlistentry>
1293-
1294-
<varlistentry>
1295-
<term><option>TAR=<replaceable>/path/to/tar</></option></term>
1296-
<listitem>
1297-
<para>
1298-
<replaceable>/path/to/tar</> is the full path to your tar program.
1299-
</para>
1300-
</listitem>
1301-
</varlistentry>
1302-
1303-
<varlistentry>
1304-
<term><option>TCLISH=<replaceable>/path/to/tclish</></option></term>
1305-
<listitem>
1306-
<para>
1307-
<replaceable>/path/to/tclish</> is the full path to your tclish program.
1308-
</para>
1309-
</listitem>
1310-
</varlistentry>
1311-
1312-
<varlistentry>
1313-
<term><option>XGETTEXT=<replaceable>/path/to/xgettext</></option></term>
1314-
<listitem>
1315-
<para>
1316-
<replaceable>/path/to/xgettext</> is the full path to your xgettext program.
1317-
</para>
1318-
</listitem>
1319-
</varlistentry>
1320-
1321-
<varlistentry>
1322-
<term><option>YACC=<replaceable>/path/to/yacc</></option></term>
1323-
<listitem>
1324-
<para>
1325-
<replaceable>/path/to/yacc</> is the full path to your yacc program.
1326-
</para>
1327-
</listitem>
1328-
</varlistentry>
1329-
13301190
</variablelist>
13311191
</para>
13321192
</step>

0 commit comments

Comments
 (0)