summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorBruce Momjian2004-04-22 14:33:49 +0000
committerBruce Momjian2004-04-22 14:33:49 +0000
commit65b020bd611beb17e1f5adcbae699e0446afccf5 (patch)
treee2ff90c95273442f914daf98b633133a746f446c /src/bin
parent19f1649bedaf56182f01be96d44b678af9ce3cd7 (diff)
Fix filename mention in psqlrc.sample file.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/psql/Makefile4
-rw-r--r--src/bin/psql/psqlrc.sample (renamed from src/bin/psql/psql.rc.sample)2
-rw-r--r--src/bin/psql/startup.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index a29f18e88e6..a3de06182a9 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.41 2004/04/22 01:53:37 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.42 2004/04/22 14:33:45 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -50,7 +50,7 @@ distprep: $(srcdir)/sql_help.h $(srcdir)/psqlscan.c
install: all installdirs
$(INSTALL_PROGRAM) psql$(X) $(DESTDIR)$(bindir)/psql$(X)
- $(INSTALL_DATA) $(srcdir)/psql.rc.sample $(DESTDIR)$(datadir)/psql.rc.sample
+ $(INSTALL_DATA) $(srcdir)/psqlrc.sample $(DESTDIR)$(datadir)/psqlrc.sample
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/src/bin/psql/psql.rc.sample b/src/bin/psql/psqlrc.sample
index ff23bfa5282..6054fabb380 100644
--- a/src/bin/psql/psql.rc.sample
+++ b/src/bin/psql/psqlrc.sample
@@ -4,4 +4,4 @@
-- This file is read before the .psqlrc file in the user's home directory.
--
-- Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
--- rename it psql.rc.
+-- rename it psqlrc.
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index aeb7c13fbda..eb241c119e6 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.89 2004/04/22 01:53:37 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.90 2004/04/22 14:33:49 momjian Exp $
*/
#include "postgres_fe.h"
@@ -45,7 +45,7 @@ int optreset;
PsqlSettings pset;
#define PSQLRC ".psqlrc"
-#define SYSPSQLRC "psql.rc"
+#define SYSPSQLRC "psqlrc"
/*
* Structures to pass information between the option parsing routine