Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add an --man-dir to php-config too

  • Loading branch information...
commit 5ca8ba7ab655f8b434ac12577c470b5f2b9eb646 1 parent a0d8050
Hannes Magnusson bjori authored
Showing with 10 additions and 2 deletions.
  1. +2 −2 NEWS
  2. +4 −0 scripts/man1/php-config.1.in
  3. +4 −0 scripts/php-config.in
4 NEWS
View
@@ -15,8 +15,8 @@ PHP NEWS
- 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)
4 scripts/man1/php-config.1.in
View
@@ -27,6 +27,10 @@ LD Flags which PHP was compiled with
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
4 scripts/php-config.in
View
@@ -10,6 +10,7 @@ includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/
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 @@ case "$1" in
echo $php_sapis;;
--configure-options)
echo $configure_options;;
+--man-dir)
+ echo $man_dir;;
--version)
echo $version;;
--vernum)
@@ -73,6 +76,7 @@ Options:
--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]
Please sign in to comment.
Something went wrong with that request. Please try again.