Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2fc80e8

Browse files
committed
Rename 'gmake' to 'make' in docs and recommended commands
This simplifies the docs and makes it easier to cut/paste command lines.
1 parent 2a2e40a commit 2fc80e8

File tree

23 files changed

+96
-107
lines changed

23 files changed

+96
-107
lines changed

contrib/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ documentation.
1212

1313
When building from the source distribution, these modules are not
1414
built automatically, unless you build the "world" target. You can
15-
also build and install them all by running "gmake all" and "gmake
15+
also build and install them all by running "make all" and "make
1616
install" in this directory; or to build and install just one selected
1717
module, do the same in that module's subdirectory.
1818

contrib/pg_upgrade/TESTING

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ specific to each major version of Postgres.
1010
Here are the steps needed to create a regression database dump file:
1111

1212
1) Create and populate the regression database in the old cluster
13-
This database can be created by running 'gmake installcheck' from
13+
This database can be created by running 'make installcheck' from
1414
src/test/regression.
1515

1616
2) Use pg_dump to dump out the regression database. Use the new
@@ -66,18 +66,18 @@ steps:
6666
The shell script test.sh in this directory performs more or less this
6767
procedure. You can invoke it by running
6868

69-
gmake check
69+
make check
7070

7171
or by running
7272

73-
gmake installcheck
73+
make installcheck
7474

75-
if "gmake install" (or "gmake install-world") were done beforehand.
75+
if "make install" (or "make install-world") were done beforehand.
7676
When invoked without arguments, it will run an upgrade from the
7777
version in this source tree to a new instance of the same version. To
7878
test an upgrade from a different version, invoke it like this:
7979

80-
gmake installcheck oldbindir=...otherversion/bin oldsrc=...somewhere/postgresql
80+
make installcheck oldbindir=...otherversion/bin oldsrc=...somewhere/postgresql
8181

8282
In this case, you will have to manually eyeball the resulting dump
8383
diff for version-specific differences, as explained above.

doc/src/sgml/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ INSTALL.html: standalone-install.sgml installation.sgml version.sgml
234234
## XSLT processing
235235
##
236236

237-
# For obscure reasons, gmake 3.81 complains about circular dependencies
237+
# For obscure reasons, GNU make 3.81 complains about circular dependencies
238238
# if we try to do "make all" in a VPATH build without the explicit
239-
# $(srcdir) on the postgres.sgml dependency in this rule. gmake bug?
239+
# $(srcdir) on the postgres.sgml dependency in this rule. GNU make bug?
240240
postgres.xml: $(srcdir)/postgres.sgml $(ALMOSTALLSGML)
241241
$(OSX) -D. -x lower -i include-xslt-index $< >postgres.xmltmp
242242
$(PERL) -p -e 's/\[(aacute|acirc|aelig|agrave|amp|aring|atilde|auml|bull|copy|eacute|egrave|gt|iacute|lt|mdash|nbsp|ntilde|oacute|ocirc|oslash|ouml|pi|quot|scaron|uuml) *\]/\&\1;/gi;' \

doc/src/sgml/contrib.sgml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
(see <xref linkend="build">).
2727
You can build and install all of them by running:
2828
<screen>
29-
<userinput>gmake</userinput>
30-
<userinput>gmake install</userinput>
29+
<userinput>make</userinput>
30+
<userinput>make install</userinput>
3131
</screen>
3232
in the <literal>contrib</literal> directory of a configured source tree;
3333
or to build and install
3434
just one selected module, do the same in that module's subdirectory.
3535
Many of the modules have regression tests, which can be executed by
3636
running:
3737
<screen>
38-
<userinput>gmake check</userinput>
38+
<userinput>make check</userinput>
3939
</screen>
4040
before installation or
4141
<screen>
42-
<userinput>gmake installcheck</userinput>
42+
<userinput>make installcheck</userinput>
4343
</screen>
4444
once you have a <productname>PostgreSQL</> server running.
4545
</para>

doc/src/sgml/docguide.sgml

+11-11
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ checking for osx... osx
581581
<para>
582582
To build the <acronym>HTML</acronym> version of the documentation:
583583
<screen>
584-
<prompt>doc/src/sgml$ </prompt><userinput>gmake html</userinput>
584+
<prompt>doc/src/sgml$ </prompt><userinput>make html</userinput>
585585
</screen>
586586
This is also the default target. The output appears in the
587587
subdirectory <filename>html</filename>.
@@ -592,14 +592,14 @@ checking for osx... osx
592592
stages. If you do not care about the index, and just want to
593593
proof-read the output, use <literal>draft</>:
594594
<screen>
595-
<prompt>doc/src/sgml$ </prompt><userinput>gmake draft</userinput>
595+
<prompt>doc/src/sgml$ </prompt><userinput>make draft</userinput>
596596
</screen>
597597
</para>
598598

599599
<para>
600600
To build the documentation as a single HTML page, use:
601601
<screen>
602-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.html</userinput>
602+
<prompt>doc/src/sgml$ </prompt><userinput>make postgres.html</userinput>
603603
</screen>
604604
</para>
605605
</sect2>
@@ -616,7 +616,7 @@ checking for osx... osx
616616
pages, use the commands:
617617
<programlisting>
618618
cd doc/src/sgml
619-
gmake man
619+
make man
620620
</programlisting>
621621
</para>
622622
</sect2>
@@ -634,11 +634,11 @@ gmake man
634634
<para>
635635
To generate PostScript via <acronym>DVI</acronym> in A4 format:
636636
<screen>
637-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-A4.ps</userinput>
637+
<prompt>doc/src/sgml$ </prompt><userinput>make postgres-A4.ps</userinput>
638638
</screen>
639639
In U.S. letter format:
640640
<screen>
641-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-US.ps</userinput>
641+
<prompt>doc/src/sgml$ </prompt><userinput>make postgres-US.ps</userinput>
642642
</screen>
643643
</para>
644644
</listitem>
@@ -647,11 +647,11 @@ gmake man
647647
<para>
648648
To make a <acronym>PDF</acronym>:
649649
<screen>
650-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-A4.pdf</userinput>
650+
<prompt>doc/src/sgml$ </prompt><userinput>make postgres-A4.pdf</userinput>
651651
</screen>
652652
or:
653653
<screen>
654-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres-US.pdf</userinput>
654+
<prompt>doc/src/sgml$ </prompt><userinput>make postgres-US.pdf</userinput>
655655
</screen>
656656
(Of course you can also make a <acronym>PDF</acronym> version
657657
from the PostScript, but if you generate <acronym>PDF</acronym>
@@ -741,7 +741,7 @@ save_size.pdfjadetex = 15000
741741
<para>
742742
Generate the <acronym>RTF</acronym> version by typing:
743743
<screen>
744-
<prompt>doc/src/sgml$ </prompt><userinput>gmake postgres.rtf</userinput>
744+
<prompt>doc/src/sgml$ </prompt><userinput>make postgres.rtf</userinput>
745745
</screen>
746746
</para>
747747
</step>
@@ -948,7 +948,7 @@ save_size.pdfjadetex = 15000
948948
corresponds to <xref linkend="installation">, with some minor
949949
changes to account for the different context. To recreate the
950950
file, change to the directory <filename>doc/src/sgml</filename>
951-
and enter <userinput>gmake INSTALL</userinput>.
951+
and enter <userinput>make INSTALL</userinput>.
952952
</para>
953953

954954
<para>
@@ -966,7 +966,7 @@ save_size.pdfjadetex = 15000
966966
method to just check the correct syntax of the documentation
967967
files, which only takes a few seconds:
968968
<screen>
969-
<prompt>doc/src/sgml$ </prompt><userinput>gmake check</userinput>
969+
<prompt>doc/src/sgml$ </prompt><userinput>make check</userinput>
970970
</screen>
971971
</para>
972972
</sect2>

doc/src/sgml/installation.sgml

+28-39
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ in a standalone-ignore clause.
3232
<para>
3333
<synopsis>
3434
./configure
35-
gmake
35+
make
3636
su
37-
gmake install
37+
make install
3838
adduser postgres
3939
mkdir /usr/local/pgsql/data
4040
chown postgres /usr/local/pgsql/data
@@ -77,14 +77,11 @@ su - postgres
7777

7878
<acronym>GNU</> <application>make</> version 3.80 or newer is required; other
7979
<application>make</> programs or older <acronym>GNU</> <application>make</> versions will <emphasis>not</> work.
80-
<acronym>GNU</> <application>make</> is often installed under
81-
the name <filename>gmake</filename>; this document will always
82-
refer to it by that name. (On some systems
83-
<acronym>GNU</acronym> <application>make</> is the default tool with the name
84-
<filename>make</>.) To test for <acronym>GNU</acronym>
80+
(<acronym>GNU</> <application>make</> is sometimes installed under
81+
the name <filename>gmake</filename>.) To test for <acronym>GNU</acronym>
8582
<application>make</application> enter:
8683
<screen>
87-
<userinput>gmake --version</userinput>
84+
<userinput>make --version</userinput>
8885
</screen>
8986
</para>
9087
</listitem>
@@ -422,7 +419,7 @@ su - postgres
422419
<userinput>mkdir build_dir</userinput>
423420
<userinput>cd build_dir</userinput>
424421
<userinput>/path/to/source/tree/configure [options go here]</userinput>
425-
<userinput>gmake</userinput>
422+
<userinput>make</userinput>
426423
</screen>
427424
</para>
428425

@@ -1441,7 +1438,7 @@ su - postgres
14411438
source code lines. If you get confused while trying to debug
14421439
optimized code, recompile the specific files of interest with
14431440
<option>-O0</>. An easy way to do this is by passing an option
1444-
to <application>make</>: <command>gmake PROFILE=-O0 file.o</>.
1441+
to <application>make</>: <command>make PROFILE=-O0 file.o</>.
14451442
</para>
14461443
</note>
14471444
</step>
@@ -1452,7 +1449,7 @@ su - postgres
14521449
<para>
14531450
To start the build, type:
14541451
<screen>
1455-
<userinput>gmake</userinput>
1452+
<userinput>make</userinput>
14561453
</screen>
14571454
(Remember to use <acronym>GNU</> <application>make</>.) The build
14581455
will take a few minutes depending on your
@@ -1467,7 +1464,7 @@ All of PostgreSQL is successfully made. Ready to install.
14671464
documentation (HTML and man pages), and the additional modules
14681465
(<filename>contrib</filename>), type instead:
14691466
<screen>
1470-
<userinput>gmake world</userinput>
1467+
<userinput>make world</userinput>
14711468
</screen>
14721469
The last line displayed should be:
14731470
<screen>
@@ -1490,7 +1487,7 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
14901487
runs on your machine in the way the developers expected it
14911488
to. Type:
14921489
<screen>
1493-
<userinput>gmake check</userinput>
1490+
<userinput>make check</userinput>
14941491
</screen>
14951492
(This won't work as root; do it as an unprivileged user.)
14961493
<![%standalone-include[The file
@@ -1518,7 +1515,7 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15181515
<para>
15191516
To install <productname>PostgreSQL</> enter:
15201517
<screen>
1521-
<userinput>gmake install</userinput>
1518+
<userinput>make install</userinput>
15221519
</screen>
15231520
This will install files into the directories that were specified
15241521
in <xref linkend="configure">. Make sure that you have appropriate
@@ -1531,21 +1528,21 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15311528
<para>
15321529
To install the documentation (HTML and man pages), enter:
15331530
<screen>
1534-
<userinput>gmake install-docs</userinput>
1531+
<userinput>make install-docs</userinput>
15351532
</screen>
15361533
</para>
15371534

15381535
<para>
15391536
If you built the world above, type instead:
15401537
<screen>
1541-
<userinput>gmake install-world</userinput>
1538+
<userinput>make install-world</userinput>
15421539
</screen>
15431540
This also installs the documentation.
15441541
</para>
15451542

15461543
<para>
1547-
You can use <literal>gmake install-strip</literal> instead of
1548-
<literal>gmake install</literal> to strip the executable files and
1544+
You can use <literal>make install-strip</literal> instead of
1545+
<literal>make install</literal> to strip the executable files and
15491546
libraries as they are installed. This will save some space. If
15501547
you built with debugging support, stripping will effectively
15511548
remove the debugging support, so it should only be done if
@@ -1560,7 +1557,7 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15601557
The standard installation provides all the header files needed for client
15611558
application development as well as for server-side program
15621559
development, such as custom functions or data types written in C.
1563-
(Prior to <productname>PostgreSQL</> 8.0, a separate <literal>gmake
1560+
(Prior to <productname>PostgreSQL</> 8.0, a separate <literal>make
15641561
install-all-headers</> command was needed for the latter, but this
15651562
step has been folded into the standard install.)
15661563
</para>
@@ -1571,10 +1568,10 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15711568
If you want to install only the client applications and
15721569
interface libraries, then you can use these commands:
15731570
<screen>
1574-
<userinput>gmake -C src/bin install</>
1575-
<userinput>gmake -C src/include install</>
1576-
<userinput>gmake -C src/interfaces install</>
1577-
<userinput>gmake -C doc install</>
1571+
<userinput>make -C src/bin install</>
1572+
<userinput>make -C src/include install</>
1573+
<userinput>make -C src/interfaces install</>
1574+
<userinput>make -C doc install</>
15781575
</screen>
15791576
<filename>src/bin</> has a few binaries for server-only use,
15801577
but they are small.
@@ -1586,7 +1583,7 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15861583
<formalpara>
15871584
<title>Uninstallation:</title>
15881585
<para>
1589-
To undo the installation use the command <command>gmake
1586+
To undo the installation use the command <command>make
15901587
uninstall</>. However, this will not remove any created directories.
15911588
</para>
15921589
</formalpara>
@@ -1596,11 +1593,11 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
15961593

15971594
<para>
15981595
After the installation you can free disk space by removing the built
1599-
files from the source tree with the command <command>gmake
1596+
files from the source tree with the command <command>make
16001597
clean</>. This will preserve the files made by the <command>configure</command>
1601-
program, so that you can rebuild everything with <command>gmake</>
1598+
program, so that you can rebuild everything with <command>make</>
16021599
later on. To reset the source tree to the state in which it was
1603-
distributed, use <command>gmake distclean</>. If you are going to
1600+
distributed, use <command>make distclean</>. If you are going to
16041601
build for several platforms within the same source tree you must do
16051602
this and re-configure for each platform. (Alternatively, use
16061603
a separate build tree for each platform, so that the source tree
@@ -1612,7 +1609,7 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
16121609
If you perform a build and then discover that your <command>configure</>
16131610
options were wrong, or if you change anything that <command>configure</>
16141611
investigates (for example, software upgrades), then it's a good
1615-
idea to do <command>gmake distclean</> before reconfiguring and
1612+
idea to do <command>make distclean</> before reconfiguring and
16161613
rebuilding. Without this, your changes in configuration choices
16171614
might not propagate everywhere they need to.
16181615
</para>
@@ -1904,7 +1901,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
19041901
<listitem>
19051902
<para>
19061903
Run the regression tests against the installed server (using
1907-
<command>gmake installcheck</command>). If you didn't run the
1904+
<command>make installcheck</command>). If you didn't run the
19081905
tests before installation, you should definitely do it now. This
19091906
is also explained in the documentation.
19101907
</para>
@@ -2358,12 +2355,6 @@ createlang: language installation failed: ERROR: could not load library "/opt/d
23582355
</para>
23592356
</listitem>
23602357

2361-
<listitem>
2362-
<para>
2363-
The GNU make command is called <command>make</command>, not <command>gmake</command>.
2364-
</para>
2365-
</listitem>
2366-
23672358
<listitem>
23682359
<para>
23692360
The <command>adduser</command> command is not supported; use
@@ -2647,9 +2638,7 @@ PHSS_30849 s700_800 u2comp/be/plugin library Patch
26472638
<para>
26482639
You need to use the GNU Make program, which is on the Skunkware
26492640
CD. By default, it installs
2650-
as <filename>/usr/local/bin/make</filename>. To avoid confusion
2651-
with the SCO <filename>make</filename> program, you may want to rename GNU <filename>make</filename> to
2652-
<filename>gmake</filename>.
2641+
as <filename>/usr/local/bin/make</filename>.
26532642
</para>
26542643

26552644
<para>
@@ -2902,7 +2891,7 @@ AbortTransaction utils/probes.o
29022891
CommitTransaction utils/probes.o
29032892
ld: fatal: Symbol referencing errors. No output written to postgres
29042893
collect2: ld returned 1 exit status
2905-
gmake: *** [postgres] Error 1
2894+
make: *** [postgres] Error 1
29062895
</screen>
29072896
your DTrace installation is too old to handle probes in static
29082897
functions. You need Solaris 10u4 or newer.

doc/src/sgml/nls.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ msgstr "another translated"
165165
If you need to start a new translation effort, then first run the
166166
command:
167167
<programlisting>
168-
gmake init-po
168+
make init-po
169169
</programlisting>
170170
This will create a file
171171
<filename><replaceable>progname</replaceable>.pot</filename>.
@@ -188,7 +188,7 @@ AVAIL_LANGUAGES := de fr
188188
changed or added by the programmers. In this case you do not need
189189
to start from scratch. Instead, run the command:
190190
<programlisting>
191-
gmake update-po
191+
make update-po
192192
</programlisting>
193193
which will create a new blank message catalog file (the pot file
194194
you started with) and will merge it with the existing PO files.

0 commit comments

Comments
 (0)