c72fcc
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
c72fcc
index c410087..e546b7b 100644
c72fcc
--- a/src/bin/pg_config/Makefile
c72fcc
+++ b/src/bin/pg_config/Makefile
c72fcc
@@ -11,28 +11,30 @@
c72fcc
 PGFILEDESC = "pg_config - report configuration information"
c72fcc
 PGAPPICON=win32
c72fcc
 
c72fcc
+PG_CONFIG = pg_server_config$(X)
c72fcc
+
c72fcc
 subdir = src/bin/pg_config
c72fcc
 top_builddir = ../../..
c72fcc
 include $(top_builddir)/src/Makefile.global
c72fcc
 
c72fcc
 OBJS=   pg_config.o $(WIN32RES)
c72fcc
 
c72fcc
-all: pg_config
c72fcc
+all: $(PG_CONFIG)
c72fcc
 
c72fcc
-pg_config: $(OBJS) | submake-libpgport
c72fcc
-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
c72fcc
+$(PG_CONFIG): $(OBJS) | submake-libpgport
c72fcc
+	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
c72fcc
 
c72fcc
 install: all installdirs
c72fcc
-	$(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
c72fcc
+	$(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
c72fcc
 
c72fcc
 installdirs:
c72fcc
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
c72fcc
 
c72fcc
 uninstall:
c72fcc
-	rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
c72fcc
+	rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
c72fcc
 
c72fcc
 clean distclean maintainer-clean:
c72fcc
-	rm -f pg_config$(X) $(OBJS)
c72fcc
+	rm -f $(PG_CONFIG)  $(OBJS)
c72fcc
 	rm -rf tmp_check
c72fcc
 
c72fcc
 check:
c72fcc
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
c72fcc
index 1d41f90ee0..0f34f371cc 100644
c72fcc
--- a/src/bin/pg_config/nls.mk
c72fcc
+++ b/src/bin/pg_config/nls.mk
c72fcc
@@ -1,4 +1,4 @@
c72fcc
 # src/bin/pg_config/nls.mk
c72fcc
-CATALOG_NAME     = pg_config
c72fcc
+CATALOG_NAME     = pg_server_config
c72fcc
 AVAIL_LANGUAGES  = cs de es fr it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW
c72fcc
 GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c