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

Commit 1a205f7

Browse files
committed
Added variable PROJECT_NAME to configure and MAkefile.global, and entity &project; to version.sgml. Fixes PGPRO-1445
1 parent 92ba324 commit 1a205f7

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

configure

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

629629
ac_subst_vars='LTLIBOBJS
630+
PROJECT_NAME
630631
PRODUCT_NAME
631632
PGPRO_VERSION
632633
vpath_build
@@ -2780,11 +2781,13 @@ else
27802781
fi
27812782

27822783

2784+
27832785
PGPRO_VERSION="$PACKAGE_VERSION.1"
27842786
PGPRO_PACKAGE_NAME="PostgresPro"
27852787
PGPRO_EDITION="standard"
27862788
PGPRO_EDN="std"
2787-
PRODUCT_NAME="Postgres Pro"
2789+
PRODUCT_NAME="Postgres Pro Standard"
2790+
PROJECT_NAME="Postgres Pro"
27882791

27892792

27902793

@@ -17071,6 +17074,8 @@ fi
1707117074

1707217075

1707317076

17077+
17078+
1707417079
ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1707517080

1707617081

configure.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3838
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
41+
4142
PGPRO_VERSION="$PACKAGE_VERSION.1"
4243
PGPRO_PACKAGE_NAME="PostgresPro"
4344
PGPRO_EDITION="standard"
4445
PGPRO_EDN="std"
45-
PRODUCT_NAME="Postgres Pro"
46+
PRODUCT_NAME="Postgres Pro Standard"
47+
PROJECT_NAME="Postgres Pro"
4648
AC_SUBST(PGPRO_PACKAGE_NAME)
4749
AC_SUBST(PGPRO_EDITION)
4850
AC_SUBST(PGPRO_EDN)
@@ -2258,6 +2260,8 @@ AC_SUBST(PGPRO_VERSION)
22582260

22592261
AC_SUBST(PRODUCT_NAME)
22602262

2263+
AC_SUBST(PROJECT_NAME)
2264+
22612265
AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
22622266

22632267
AC_CONFIG_LINKS([

doc/src/sgml/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ version.sgml: $(top_srcdir)/configure
105105
echo "<!ENTITY productname \"$(PRODUCT_NAME)\">"; \
106106
echo "<!ENTITY edition \"$(PGPRO_EDITION)\">"; \
107107
echo "<!ENTITY edn \"$(PGPRO_EDN)\">"; \
108+
echo "<!ENTITY project \"$(PROJECT_NAME)\">"; \
108109
} > $@
109110

110111
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
4545
PGPRO_EDITION = @PGPRO_EDITION@
4646
PGPRO_EDN = @PGPRO_EDN@
4747
PRODUCT_NAME = @PRODUCT_NAME@
48+
PROJECT_NAME = @PROJECT_NAME@
4849

4950
# Set top_srcdir, srcdir, and VPATH.
5051
ifdef PGXS

0 commit comments

Comments
 (0)