This simple patch fixes a typo, ensure pg_config is removed in win32

and correct some splitted message mistake.

Euler Taveira de Oliveira

diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index e08896f69bb1038e8c637dfece20af5da86de73a..bf6333fa7f6c7f6df9a5156fb0bbfb2ef828e221 100644 (file)
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -1,10 +1,10 @@
 #-------------------------------------------------------------------------
 #
-# Makefile for src/bin/pg_controldata
+# Makefile for src/bin/pg_config
 #
 # Copyright (c) 1998-2002, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.10 2004/10/04 18:05:54 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.11 2004/10/06 17:21:45 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -28,7 +28,7 @@ installdirs:
        $(mkinstalldirs) $(DESTDIR)$(bindir)
 
 uninstall:
-       rm -f $(DESTDIR)$(bindir)/pg_config
+       rm -f $(DESTDIR)$(bindir)/pg_config$(X)
 
 clean distclean maintainer-clean:
        rm -f pg_config$(X) $(OBJS)

diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index 547628d911c6db13325d0f19453c6221b651e99b..02ad203ae5e15633876570bcb2f1493b6a9233d7 100644 (file)
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -17,7 +17,7 @@
  *
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.6 2004/08/29 05:06:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.7 2004/10/06 17:21:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,14 +38,14 @@ help()
        printf(_("  %s OPTION...\n\n"), progname);
        printf(_("Options:\n"));
        printf(_("  --bindir              show location of user executables\n"));
-       printf(_("  --includedir          show location of C header files of the client\n"));
-       printf(_("                        interfaces\n"));
+       printf(_("  --includedir          show location of C header files of the client\n"
+                "                        interfaces\n"));
        printf(_("  --includedir-server   show location of C header files for the server\n"));
        printf(_("  --libdir              show location of object code libraries\n"));
        printf(_("  --pkglibdir           show location of dynamically loadable modules\n"));
        printf(_("  --pgxs                show location of extension makefile\n"));
-       printf(_("  --configure           show options given to 'configure' script when\n"));
-       printf(_("                        PostgreSQL was built\n"));
+       printf(_("  --configure           show options given to 'configure' script when\n"
+                "                        PostgreSQL was built\n"));
        printf(_("  --version             show the PostgreSQL version, then exit\n"));
        printf(_("  --help                show this help, then exit\n\n"));
        printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));