Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bb9b0ed

Browse files
committed
Set PRODUCT_NAME variable in the configure script
1 parent 0fc6e45 commit bb9b0ed

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,7 @@ ac_includes_default="\
627627
#endif"
628628

629629
ac_subst_vars='LTLIBOBJS
630+
PRODUCT_NAME
630631
PGPRO_VERSION
631632
vpath_build
632633
PG_VERSION_NUM
@@ -2781,6 +2782,7 @@ fi
27812782
PGPRO_VERSION="$PACKAGE_VERSION.2"
27822783
PGPRO_PACKAGE_NAME="PostgresPro"
27832784
PGPRO_EDITION="standard"
2785+
PRODUCT_NAME="PostgresPro Standard"
27842786

27852787

27862788

@@ -16906,6 +16908,8 @@ fi
1690616908

1690716909

1690816910

16911+
16912+
1690916913
ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1691016914

1691116915

configure.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
4141
PGPRO_VERSION="$PACKAGE_VERSION.2"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="standard"
44+
PRODUCT_NAME="PostgresPro Standard"
4445
AC_SUBST(PGPRO_PACKAGE_NAME)
4546
AC_SUBST(PGPRO_EDITION)
4647
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
@@ -2242,6 +2243,8 @@ AC_SUBST(vpath_build)
22422243

22432244
AC_SUBST(PGPRO_VERSION)
22442245

2246+
AC_SUBST(PRODUCT_NAME)
2247+
22452248
AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
22462249

22472250
AC_CONFIG_LINKS([

doc/src/sgml/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ ifndef XSLTPROC
5555
XSLTPROC = $(missing) xsltproc
5656
endif
5757

58+
ifndef PRODUCT_NAME
59+
PRODUCT_NAME = PostgreSQL
60+
endif
61+
5862
override XSLTPROCFLAGS += --stringparam pg.version '$(PGPRO_VERSION)' --stringparam pg.productname '$(PRODUCT_NAME)'
5963

6064

@@ -97,7 +101,7 @@ version.sgml: $(top_srcdir)/configure
97101
{ \
98102
echo "<!ENTITY version \"$(PGPRO_VERSION)\">"; \
99103
echo "<!ENTITY majorversion \"$(MAJORVERSION)\">"; \
100-
echo "<!ENTITY productname \"$(PRODUCTNAME)\">"; \
104+
echo "<!ENTITY productname \"$(PRODUCT_NAME)\">"; \
101105
} > $@
102106

103107
features-supported.sgml: $(top_srcdir)/src/backend/catalog/sql_feature_packages.txt $(top_srcdir)/src/backend/catalog/sql_features.txt

src/Makefile.global.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ all:
3939
VERSION = @PACKAGE_VERSION@
4040
MAJORVERSION = @PG_MAJORVERSION@
4141
VERSION_NUM = @PG_VERSION_NUM@
42-
4342
PGPRO_VERSION = @PGPRO_VERSION@
4443
PGPRO_PACKAGE_NAME = @PGPRO_PACKAGE_NAME@
4544
PACKAGE_TARNAME = @PACKAGE_TARNAME@
45+
PGPRO_EDITION = @PGPRO_EDITION@
46+
PRODUCT_NAME = @PRODUCT_NAME@
4647

4748
# Set top_srcdir, srcdir, and VPATH.
4849
ifdef PGXS

0 commit comments

Comments
 (0)