Skip to content

Commit 1933ae6

Browse files
committed
Add PostgreSQL home page to --help output
Per emerging standard in GNU programs and elsewhere. Autoconf already has support for specifying a home page, so we can just that. Reviewed-by: Daniel Gustafsson <daniel@yesql.se> Discussion: https://www.postgresql.org/message-id/flat/8d389c5f-7fb5-8e48-9a4a-68cec44786fa%402ndquadrant.com
1 parent 8649341 commit 1933ae6

File tree

37 files changed

+53
-14
lines changed

37 files changed

+53
-14
lines changed

configure

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ PACKAGE_TARNAME='postgresql'
585585
PACKAGE_VERSION='13devel'
586586
PACKAGE_STRING='PostgreSQL 13devel'
587587
PACKAGE_BUGREPORT='pgsql-bugs@lists.postgresql.org'
588-
PACKAGE_URL=''
588+
PACKAGE_URL='https://www.postgresql.org/'
589589

590590
ac_unique_file="src/backend/access/common/heaptuple.c"
591591
ac_default_prefix=/usr/local/pgsql
@@ -1600,6 +1600,7 @@ Use these variables to override the choices made by `configure' or to help
16001600
it to find libraries and programs with nonstandard names/locations.
16011601

16021602
Report bugs to <pgsql-bugs@lists.postgresql.org>.
1603+
PostgreSQL home page: <https://www.postgresql.org/>.
16031604
_ACEOF
16041605
ac_status=$?
16051606
fi
@@ -19516,7 +19517,8 @@ $config_links
1951619517
Configuration commands:
1951719518
$config_commands
1951819519

19519-
Report bugs to <pgsql-bugs@lists.postgresql.org>."
19520+
Report bugs to <pgsql-bugs@lists.postgresql.org>.
19521+
PostgreSQL home page: <https://www.postgresql.org/>."
1952019522

1952119523
_ACEOF
1952219524
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [13devel], [pgsql-bugs@lists.postgresql.org])
20+
AC_INIT([PostgreSQL], [13devel], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not

contrib/oid2name/oid2name.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,9 @@ help(const char *progname)
219219
" -p, --port=PORT database server port number\n"
220220
" -U, --username=USERNAME connect as specified database user\n"
221221
"\nThe default action is to show all database OIDs.\n\n"
222-
"Report bugs to <%s>.\n",
223-
progname, progname, PACKAGE_BUGREPORT);
222+
"Report bugs to <%s>.\n"
223+
"%s home page: <%s>\n",
224+
progname, progname, PACKAGE_BUGREPORT, PACKAGE_NAME, PACKAGE_URL);
224225
}
225226

226227
/*

contrib/pg_standby/pg_standby.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ usage(void)
613613
"e.g.\n"
614614
" restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");
615615
printf("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
616+
printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
616617
}
617618

618619
#ifndef WIN32

contrib/vacuumlo/vacuumlo.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ usage(const char *progname)
437437
printf(" -W, --password force password prompt\n");
438438
printf("\n");
439439
printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
440+
printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
440441
}
441442

442443

src/Makefile.global.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ VERSION = @PACKAGE_VERSION@
4040
MAJORVERSION = @PG_MAJORVERSION@
4141
VERSION_NUM = @PG_VERSION_NUM@
4242

43+
PACKAGE_URL = @PACKAGE_URL@
44+
4345
# Set top_srcdir, srcdir, and VPATH.
4446
ifdef PGXS
4547
top_srcdir = $(top_builddir)

src/Makefile.shlib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ endif # PORTNAME == cygwin || PORTNAME == win32
389389
%.pc: $(MAKEFILE_LIST)
390390
echo 'Name: lib$(NAME)' >$@
391391
echo 'Description: PostgreSQL lib$(NAME) library' >>$@
392-
echo 'Url: http://www.postgresql.org/' >>$@
392+
echo 'Url: $(PACKAGE_URL)' >>$@
393393
echo 'Version: $(VERSION)' >>$@
394394
echo 'Requires: ' >>$@
395395
echo 'Requires.private: $(PKG_CONFIG_REQUIRES_PRIVATE)' >>$@

src/backend/main/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ help(const char *progname)
360360
"configuration settings and how to set them on the command line or in\n"
361361
"the configuration file.\n\n"
362362
"Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
363+
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
363364
}
364365

365366

src/bin/initdb/initdb.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,6 +2323,7 @@ usage(const char *progname)
23232323
printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
23242324
"is used.\n"));
23252325
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
2326+
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
23262327
}
23272328

23282329
static void

src/bin/pg_archivecleanup/pg_archivecleanup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ usage(void)
270270
"e.g.\n"
271271
" pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"));
272272
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
273+
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
273274
}
274275

275276
/*------------ MAIN ----------------------------------------*/

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy