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