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