From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 1 Jun 2004 03:32:42 +0000 (+0000)
Subject: More locale fixes for pg_ctl.
X-Git-Tag: REL8_0_0BETA1~466
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=962a94bb5a3604f4c4f2defa84872c02829f2fc5;p=postgresql

More locale fixes for pg_ctl.
---

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index d9d5899ef1..ce0fc25901 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.3 2004/06/01 01:28:03 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.4 2004/06/01 03:32:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -12,6 +12,7 @@
 #include "postgres_fe.h"
 #include "libpq-fe.h"
 
+#include <locale.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -402,7 +403,8 @@ do_start(void)
 			if (ret == -1)
 				fprintf(stderr,
 						_("The program \"postmaster\" is needed by %s "
-				   "but was not found in the same directory as \"%s\".\n"
+						  "but was not found in the same directory as "
+						  "\"%s\".\n"
 						  "Check your installation.\n"),
 						progname, progname);
 			else
diff --git a/src/nls-global.mk b/src/nls-global.mk
index bdd7fb3980..fc681bdd44 100644
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/nls-global.mk,v 1.9 2003/11/29 19:51:39 pgsql Exp $
+# $PostgreSQL: pgsql/src/nls-global.mk,v 1.10 2004/06/01 03:32:28 momjian Exp $
 
 # Common rules for Native Language Support (NLS)
 #
@@ -6,11 +6,11 @@
 # needs to contain a file 'nls.mk' with the following make variable
 # assignments:
 #
-# CATALOG_NAME	        -- name of the message catalog (xxx.po); probably
-#                          name of the program
+# CATALOG_NAME		-- name of the message catalog (xxx.po); probably
+#			   name of the program
 # AVAIL_LANGUAGES	-- list of languages that are provided/supported
-# GETTEXT_FILES         -- list of source files that contain message strings
-# GETTEXT_TRIGGERS      -- (optional) list of functions that contain
+# GETTEXT_FILES		-- list of source files that contain message strings
+# GETTEXT_TRIGGERS	-- (optional) list of functions that contain
 #                          translatable strings
 #
 # That's all, the rest is done here, if --enable-nls was specified.