bjori Mon, 18 Apr 2011 11:13:37 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310309
Log: Add an --man-dir to php-config too Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/scripts/man1/php-config.1.in U php/php-src/branches/PHP_5_3/scripts/php-config.in U php/php-src/trunk/scripts/man1/php-config.1.in U php/php-src/trunk/scripts/php-config.in Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-04-18 10:11:42 UTC (rev 310308) +++ php/php-src/branches/PHP_5_3/NEWS 2011-04-18 11:13:37 UTC (rev 310309) @@ -15,8 +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) + . Added PHP_MANDIR constant telling where the manpages were installed into, + and an --man-dir argument to php-config. (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/scripts/man1/php-config.1.in =================================================================== --- php/php-src/branches/PHP_5_3/scripts/man1/php-config.1.in 2011-04-18 10:11:42 UTC (rev 310308) +++ php/php-src/branches/PHP_5_3/scripts/man1/php-config.1.in 2011-04-18 11:13:37 UTC (rev 310309) @@ -27,6 +27,10 @@ Extra libraries which PHP was compiled with .TP .PD 0 +.B \-\-man-dir +The directory prefix where the manpages is installed +.TP +.PD 0 .B \-\-extension-dir Directory where extensions are searched by default .TP Modified: php/php-src/branches/PHP_5_3/scripts/php-config.in =================================================================== --- php/php-src/branches/PHP_5_3/scripts/php-config.in 2011-04-18 10:11:42 UTC (rev 310308) +++ php/php-src/branches/PHP_5_3/scripts/php-config.in 2011-04-18 11:13:37 UTC (rev 310309) @@ -10,6 +10,7 @@ ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" extension_dir='@EXTENSION_DIR@' +man_dir=`eval echo @mandir@` program_prefix="@program_prefix@" program_suffix="@program_suffix@" exe_extension="@EXEEXT@" @@ -59,6 +60,8 @@ echo $php_sapis;; --configure-options) echo $configure_options;; +--man-dir) + echo $man_dir;; --version) echo $version;; --vernum) @@ -73,6 +76,7 @@ --libs [$libs] --extension-dir [$extension_dir] --include-dir [$include_dir] + --man-dir [$man_dir] --php-binary [$php_binary] --php-sapis [$php_sapis] --configure-options [$configure_options] Modified: php/php-src/trunk/scripts/man1/php-config.1.in =================================================================== --- php/php-src/trunk/scripts/man1/php-config.1.in 2011-04-18 10:11:42 UTC (rev 310308) +++ php/php-src/trunk/scripts/man1/php-config.1.in 2011-04-18 11:13:37 UTC (rev 310309) @@ -27,6 +27,10 @@ Extra libraries which PHP was compiled with .TP .PD 0 +.B \-\-man-dir +The directory prefix where the manpages is installed +.TP +.PD 0 .B \-\-extension-dir Directory where extensions are searched by default .TP Modified: php/php-src/trunk/scripts/php-config.in =================================================================== --- php/php-src/trunk/scripts/php-config.in 2011-04-18 10:11:42 UTC (rev 310308) +++ php/php-src/trunk/scripts/php-config.in 2011-04-18 11:13:37 UTC (rev 310309) @@ -10,6 +10,7 @@ ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" extension_dir='@EXTENSION_DIR@' +man_dir=`eval echo @mandir@` program_prefix="@program_prefix@" program_suffix="@program_suffix@" exe_extension="@EXEEXT@" @@ -59,6 +60,8 @@ echo $php_sapis;; --configure-options) echo $configure_options;; +--man-dir) + echo $man_dir;; --version) echo $version;; --vernum) @@ -73,6 +76,7 @@ --libs [$libs] --extension-dir [$extension_dir] --include-dir [$include_dir] + --man-dir [$man_dir] --php-binary [$php_binary] --php-sapis [$php_sapis] --configure-options [$configure_options]
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php