|
 |
0ef807 |
We should ideally provide '/bin/pg_config' in postgresql-server-devel, and
|
|
|
0ef807 |
provide no pg_config binary in libpq package. But most of the Fedora packages
|
|
|
0ef807 |
that use pg_config actually only build against PG libraries (and
|
|
|
0ef807 |
postgresql-server-devel isn't needed). So.., to avoid the initial rush around
|
|
|
0ef807 |
rhbz#1618698 change, rather provide pg_server_config binary, which int urn means
|
|
|
0ef807 |
that we'll have to fix only a minimal set of packages which really build
|
|
|
0ef807 |
PostgreSQL server modules.
|
|
|
0ef807 |
|
|
|
0ef807 |
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
|
|
|
0ef807 |
index 02e6f9d..f7c844f 100644
|
|
|
0ef807 |
--- a/src/bin/pg_config/Makefile
|
|
|
0ef807 |
+++ b/src/bin/pg_config/Makefile
|
|
|
0ef807 |
@@ -11,28 +11,30 @@
|
|
|
0ef807 |
PGFILEDESC = "pg_config - report configuration information"
|
|
|
0ef807 |
PGAPPICON=win32
|
|
|
0ef807 |
|
|
|
0ef807 |
+PG_CONFIG = pg_server_config$(X)
|
|
|
0ef807 |
+
|
|
|
0ef807 |
subdir = src/bin/pg_config
|
|
|
0ef807 |
top_builddir = ../../..
|
|
|
0ef807 |
include $(top_builddir)/src/Makefile.global
|
|
|
0ef807 |
|
|
|
0ef807 |
OBJS= pg_config.o $(WIN32RES)
|
|
|
0ef807 |
|
|
|
0ef807 |
-all: pg_config
|
|
|
0ef807 |
+all: $(PG_CONFIG)
|
|
|
0ef807 |
|
|
|
0ef807 |
-pg_config: $(OBJS) | submake-libpgport
|
|
|
0ef807 |
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
|
|
|
0ef807 |
+$(PG_CONFIG): $(OBJS) | submake-libpgport
|
|
|
0ef807 |
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
|
|
|
0ef807 |
|
|
|
0ef807 |
install: all installdirs
|
|
|
0ef807 |
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
|
|
|
0ef807 |
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
|
|
0ef807 |
|
|
|
0ef807 |
installdirs:
|
|
|
0ef807 |
$(MKDIR_P) '$(DESTDIR)$(bindir)'
|
|
|
0ef807 |
|
|
|
0ef807 |
uninstall:
|
|
|
0ef807 |
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
|
|
|
0ef807 |
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
|
|
0ef807 |
|
|
|
0ef807 |
clean distclean maintainer-clean:
|
|
|
0ef807 |
- rm -f pg_config$(X) $(OBJS)
|
|
|
0ef807 |
+ rm -f $(PG_CONFIG) $(OBJS)
|
|
|
0ef807 |
rm -rf tmp_check
|
|
|
0ef807 |
|
|
|
0ef807 |
check:
|
|
|
0ef807 |
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
|
|
|
0ef807 |
index 1d41f90..0f34f37 100644
|
|
|
0ef807 |
--- a/src/bin/pg_config/nls.mk
|
|
|
0ef807 |
+++ b/src/bin/pg_config/nls.mk
|
|
|
0ef807 |
@@ -1,4 +1,4 @@
|
|
|
0ef807 |
# src/bin/pg_config/nls.mk
|
|
|
0ef807 |
-CATALOG_NAME = pg_config
|
|
|
0ef807 |
+CATALOG_NAME = pg_server_config
|
|
|
0ef807 |
AVAIL_LANGUAGES = cs de es fr he it ja ko pl pt_BR ro ru sv tr uk vi zh_CN zh_TW
|
|
|
0ef807 |
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c
|