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

Commit 6c4307e

Browse files
committed
Added varable PGPRO_EDN and sgml entity &edn to specify abbreviated edition 'std' or 'ent' as used in the package and directory names
1 parent e80337e commit 6c4307e

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

configure

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,7 @@ build_os
761761
build_vendor
762762
build_cpu
763763
build
764+
PGPRO_EDN
764765
PGPRO_EDITION
765766
PGPRO_PACKAGE_NAME
766767
PG_MAJORVERSION
@@ -2782,10 +2783,12 @@ fi
27822783
PGPRO_VERSION="$PACKAGE_VERSION.1"
27832784
PGPRO_PACKAGE_NAME="PostgresPro"
27842785
PGPRO_EDITION="standard"
2786+
PGPRO_EDN="std"
27852787
PRODUCT_NAME="Postgres Pro Standard"
27862788

27872789

27882790

2791+
27892792
cat >>confdefs.h <<_ACEOF
27902793
#define PG_VERSION "$PG_VERSION"
27912794
_ACEOF
@@ -2801,6 +2804,11 @@ cat >>confdefs.h <<_ACEOF
28012804
_ACEOF
28022805

28032806

2807+
cat >>confdefs.h <<_ACEOF
2808+
#define PGPRO_EDN "$PGPRO_EDN"
2809+
_ACEOF
2810+
2811+
28042812
cat >>confdefs.h <<_ACEOF
28052813
#define PGPRO_VERSION "$PGPRO_VERSION"
28062814
_ACEOF

configure.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
4141
PGPRO_VERSION="$PACKAGE_VERSION.1"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="standard"
44+
PGPRO_EDN="std"
4445
PRODUCT_NAME="Postgres Pro Standard"
4546
AC_SUBST(PGPRO_PACKAGE_NAME)
4647
AC_SUBST(PGPRO_EDITION)
48+
AC_SUBST(PGPRO_EDN)
4749
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
4850
AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro name as a string])
4951
AC_DEFINE_UNQUOTED(PGPRO_EDITION,"$PGPRO_EDITION",[PostgresPro edition])
52+
AC_DEFINE_UNQUOTED(PGPRO_EDN,"$PGPRO_EDN",[PostgresPro edition abbreviated])
5053
AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro
5154
version as a string])
5255

doc/src/sgml/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ version.sgml: $(top_srcdir)/configure
104104
echo "<!ENTITY majorversion \"$(MAJORVERSION)\">"; \
105105
echo "<!ENTITY productname \"$(PRODUCT_NAME)\">"; \
106106
echo "<!ENTITY edition \"$(PGPRO_EDITION)\">"; \
107+
echo "<!ENTITY edn \"$(PGPRO_EDN)\">"; \
107108
} > $@
108109

109110
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
@@ -43,6 +43,7 @@ PGPRO_VERSION = @PGPRO_VERSION@
4343
PGPRO_PACKAGE_NAME = @PGPRO_PACKAGE_NAME@
4444
PACKAGE_TARNAME = @PACKAGE_TARNAME@
4545
PGPRO_EDITION = @PGPRO_EDITION@
46+
PGPRO_EDN = @PGPRO_EDN@
4647
PRODUCT_NAME = @PRODUCT_NAME@
4748

4849
# Set top_srcdir, srcdir, and VPATH.

0 commit comments

Comments
 (0)