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