ffc865e4a8
The PostgreSQL shared libraries are moved to 'libpq' and 'libecpg' packages, which allows us to have single library version per Fedora release, even though we will provide multiple versions of PostgreSQL servers. Related: rhbz#1618698 Version: 10.5-4
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
We should ideally provide '/bin/pg_config' in postgresql-server-devel, and
|
|
provide no pg_config binary in libpq package. But most of the Fedora packages
|
|
that use pg_config actually only build against PG libraries (and
|
|
postgresql-server-devel isn't needed). So.., to avoid the initial rush around
|
|
rhbz#1618698 change, rather provide pg_server_config binary, which int urn means
|
|
that we'll have to fix only a minimal set of packages which really build
|
|
PostgreSQL server modules.
|
|
|
|
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
|
|
index c410087..e546b7b 100644
|
|
--- a/src/bin/pg_config/Makefile
|
|
+++ b/src/bin/pg_config/Makefile
|
|
@@ -11,28 +11,30 @@
|
|
PGFILEDESC = "pg_config - report configuration information"
|
|
PGAPPICON=win32
|
|
|
|
+PG_CONFIG = pg_server_config$(X)
|
|
+
|
|
subdir = src/bin/pg_config
|
|
top_builddir = ../../..
|
|
include $(top_builddir)/src/Makefile.global
|
|
|
|
OBJS= pg_config.o $(WIN32RES)
|
|
|
|
-all: pg_config
|
|
+all: $(PG_CONFIG)
|
|
|
|
-pg_config: $(OBJS) | submake-libpgport
|
|
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
|
|
+$(PG_CONFIG): $(OBJS) | submake-libpgport
|
|
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
|
|
|
|
install: all installdirs
|
|
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
|
|
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
|
|
|
installdirs:
|
|
$(MKDIR_P) '$(DESTDIR)$(bindir)'
|
|
|
|
uninstall:
|
|
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
|
|
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
|
|
|
clean distclean maintainer-clean:
|
|
- rm -f pg_config$(X) $(OBJS)
|
|
+ rm -f $(PG_CONFIG) $(OBJS)
|
|
rm -rf tmp_check
|
|
|
|
check:
|
|
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
|
|
index 1d41f90ee0..0f34f371cc 100644
|
|
--- a/src/bin/pg_config/nls.mk
|
|
+++ b/src/bin/pg_config/nls.mk
|
|
@@ -1,4 +1,4 @@
|
|
# src/bin/pg_config/nls.mk
|
|
-CATALOG_NAME = pg_config
|
|
+CATALOG_NAME = pg_server_config
|
|
AVAIL_LANGUAGES = cs de es fr he it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW
|
|
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c
|