diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-07-02 15:21:27 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-07-02 15:21:27 +0000 |
| commit | 6fb9d2e347b14445b85d6c97f7d16527d41ccce6 (patch) | |
| tree | b75bd707655a8abeca16f69ed58f9391d5308c5c /src/bin/psql/startup.c | |
| parent | 07dfe9773127d82a960101a5a18bd9393dff0d40 (diff) | |
Version number now set in configure, available through Makefile.global
and config.h. Adjusted all referring code.
Scrapped pg_version and changed initdb accordingly. Integrated
src/utils/version.c into src/backend/utils/init/miscinit.c. Changed all
callers.
Set version number to `7.1devel'. (Non-numeric version suffixes now allowed.)
Diffstat (limited to 'src/bin/psql/startup.c')
| -rw-r--r-- | src/bin/psql/startup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 46c77ca3b23..88ef5865afd 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.33 2000/05/14 18:05:05 petere Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.34 2000/07/02 15:21:17 petere Exp $ */ #include "postgres.h" @@ -22,7 +22,6 @@ #endif #include "libpq-fe.h" -#include "version.h" #include "command.h" #include "common.h" @@ -580,7 +579,7 @@ process_psqlrc(void) exit(EXIT_FAILURE); } - sprintf(psqlrc, "%s/.psqlrc-" PG_RELEASE "." PG_VERSION "." PG_SUBVERSION, home); + sprintf(psqlrc, "%s/.psqlrc-" PG_VERSION, home); if (access(psqlrc, R_OK) == 0) process_file(psqlrc); else @@ -602,7 +601,7 @@ process_psqlrc(void) static void showVersion(void) { - puts("psql (PostgreSQL) " PG_RELEASE "." PG_VERSION "." PG_SUBVERSION); + puts("psql (PostgreSQL) " PG_VERSION); #if defined(USE_READLINE) || defined (USE_HISTORY) || defined(MULTIBYTE) fputs("contains ", stdout); |