summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in3
-rw-r--r--pear/scripts/php-config.in2
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 4fa017eace..2f17dad7d3 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,6 @@ MAJOR_VERSION=4
MINOR_VERSION=3
RELEASE_VERSION=0
EXTRA_VERSION="-dev"
-#VERSION="4.3.0-dev"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
dnl Define where extension directories are located in the configure context
@@ -1031,7 +1030,7 @@ PHP_SUBST_OLD(PHP_LIBS)
PHP_SUBST(OVERALL_TARGET)
PHP_SUBST(PHP_RPATHS)
PHP_SUBST(PHP_SAPI)
-PHP_SUBST(PHP_VERSION)
+PHP_SUBST_OLD(PHP_VERSION)
PHP_SUBST(PROG_SENDMAIL)
PHP_SUBST(SHELL)
PHP_SUBST(SHARED_LIBTOOL)
diff --git a/pear/scripts/php-config.in b/pear/scripts/php-config.in
index c2f850a000..bcb6ef35f8 100644
--- a/pear/scripts/php-config.in
+++ b/pear/scripts/php-config.in
@@ -1,7 +1,7 @@
#! /bin/sh
prefix="@prefix@"
-version="@VERSION@"
+version="@PHP_VERSION@"
includedir="@includedir@/php"
includes="-I$includedir -I$includedir/main -I$includedir/Zend"
if test '@TSRM_DIR@' != ''; then