svn: / php/php-src/branches/PHP_5_3/NEWS php/php-src/branches/PHP_5_3/configure.in php/php-src/branches/PHP_5_3/main/build-defs.h.in
php/php-src/branches/PHP_5_3/main/main.c php/php-src/trunk/configure.in php/php-src/trunk/main/build-defs.h.in php/php-src/trunk/main/main.c
phpdoc/en/trunk/appendices/reserved.constants.core.xml

bjori Mon, 18 Apr 2011 09:50:32 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310307 Log: Expose PHP_MANDIR Useful for apps (like the pear installer, phd, .. etc) to install their manpages into the same dir as php did :] Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/main/build-defs.h.in U php/php-src/branches/PHP_5_3/main/main.c U php/php-src/trunk/configure.in U php/php-src/trunk/main/build-defs.h.in U php/php-src/trunk/main/main.c U phpdoc/en/trunk/appendices/reserved.constants.core.xml Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/branches/PHP_5_3/NEWS 2011-04-18 09:50:32 UTC (rev 310307) @@ -15,6 +15,8 @@ - Core: . Fixed a crash inside dtor for error handling. (Ilia) . Implemented FR #54459 (Range function accuracy). (Adam) + . Added PHP_MANDIR constant telling where the manpages were installed into. + (Hannes) . Fixed bug #54454 (substr_compare incorrectly reports equality in some cases). (Pierrick) . Fixed bug #54238 (use-after-free in substr_replace()). (Stas) Modified: php/php-src/branches/PHP_5_3/configure.in =================================================================== --- php/php-src/branches/PHP_5_3/configure.in 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/branches/PHP_5_3/configure.in 2011-04-18 09:50:32 UTC (rev 310307) @@ -1156,6 +1156,7 @@ EXPANDED_LOCALSTATEDIR=eval echo $localstatedir EXPANDED_BINDIR=eval echo $bindir EXPANDED_SBINDIR=eval echo $sbindir +EXPANDED_MANDIR=eval echo $mandir EXPANDED_LIBDIR=$libdir EXPANDED_SYSCONFDIR=eval echo $sysconfdir EXPANDED_DATADIR=$datadir @@ -1172,6 +1173,7 @@ AC_SUBST(EXPANDED_EXTENSION_DIR) AC_SUBST(EXPANDED_BINDIR) AC_SUBST(EXPANDED_SBINDIR) +AC_SUBST(EXPANDED_MANDIR) AC_SUBST(EXPANDED_LIBDIR) AC_SUBST(EXPANDED_DATADIR) AC_SUBST(EXPANDED_SYSCONFDIR) Modified: php/php-src/branches/PHP_5_3/main/build-defs.h.in =================================================================== --- php/php-src/branches/PHP_5_3/main/build-defs.h.in 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/branches/PHP_5_3/main/build-defs.h.in 2011-04-18 09:50:32 UTC (rev 310307) @@ -81,6 +81,7 @@ #define PHP_PREFIX "@prefix@" #define PHP_BINDIR "@EXPANDED_BINDIR@" #define PHP_SBINDIR "@EXPANDED_SBINDIR@" +#define PHP_MANDIR "@EXPANDED_MANDIR@" #define PHP_LIBDIR "@EXPANDED_LIBDIR@" #define PHP_DATADIR "@EXPANDED_DATADIR@" #define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@" Modified: php/php-src/branches/PHP_5_3/main/main.c =================================================================== --- php/php-src/branches/PHP_5_3/main/main.c 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/branches/PHP_5_3/main/main.c 2011-04-18 09:50:32 UTC (rev 310307) @@ -1938,6 +1938,7 @@ REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_MANDIR", PHP_MANDIR, sizeof(PHP_MANDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS); Modified: php/php-src/trunk/configure.in =================================================================== --- php/php-src/trunk/configure.in 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/trunk/configure.in 2011-04-18 09:50:32 UTC (rev 310307) @@ -1167,6 +1167,7 @@ EXPANDED_LOCALSTATEDIR=eval echo $localstatedir EXPANDED_BINDIR=eval echo $bindir EXPANDED_SBINDIR=eval echo $sbindir +EXPANDED_MANDIR=eval echo $mandir EXPANDED_LIBDIR=$libdir EXPANDED_SYSCONFDIR=eval echo $sysconfdir EXPANDED_DATADIR=$datadir @@ -1183,6 +1184,7 @@ AC_SUBST(EXPANDED_EXTENSION_DIR) AC_SUBST(EXPANDED_BINDIR) AC_SUBST(EXPANDED_SBINDIR) +AC_SUBST(EXPANDED_MANDIR) AC_SUBST(EXPANDED_LIBDIR) AC_SUBST(EXPANDED_DATADIR) AC_SUBST(EXPANDED_SYSCONFDIR) Modified: php/php-src/trunk/main/build-defs.h.in =================================================================== --- php/php-src/trunk/main/build-defs.h.in 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/trunk/main/build-defs.h.in 2011-04-18 09:50:32 UTC (rev 310307) @@ -81,6 +81,7 @@ #define PHP_PREFIX "@prefix@" #define PHP_BINDIR "@EXPANDED_BINDIR@" #define PHP_SBINDIR "@EXPANDED_SBINDIR@" +#define PHP_MANDIR "@EXPANDED_MANDIR@" #define PHP_LIBDIR "@EXPANDED_LIBDIR@" #define PHP_DATADIR "@EXPANDED_DATADIR@" #define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@" Modified: php/php-src/trunk/main/main.c =================================================================== --- php/php-src/trunk/main/main.c 2011-04-18 09:28:06 UTC (rev 310306) +++ php/php-src/trunk/main/main.c 2011-04-18 09:50:32 UTC (rev 310307) @@ -1979,6 +1979,7 @@ REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_MANDIR", PHP_MANDIR, sizeof(PHP_MANDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS); Modified: phpdoc/en/trunk/appendices/reserved.constants.core.xml =================================================================== --- phpdoc/en/trunk/appendices/reserved.constants.core.xml 2011-04-18 09:28:06 UTC (rev 310306) +++ phpdoc/en/trunk/appendices/reserved.constants.core.xml 2011-04-18 09:50:32 UTC (rev 310307) @@ -229,6 +229,18 @@ </varlistentry> <varlistentry> <term> + <constant>PHP_MANDIR</constant> + (<type>string</type>) + </term> + <listitem> + <simpara> + Specifies where the manpages where installed into. + Available since PHP 5.3.7. + </simpara> + </listitem> + </varlistentry> + <varlistentry> + <term> <constant>PHP_LIBDIR</constant> (<type>string</type>) </term>