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

diff --git a/NEWS b/NEWS
index 17b78454c84899f2fef8fcb794365df978af9e74..39996374bc82d9d8714031304fb7770cec43420f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
index 2e49bfac8c187b273517b43380df2fee4d4e4288..5c60408f42100edbbd718dbff3f0e480d804f61a 100644 (file)
--- a/scripts/man1/php-config.1.in
+++ b/scripts/man1/php-config.1.in
@@ -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

diff --git a/scripts/php-config.in b/scripts/php-config.in
index f7d0bcd354d66158835a9d7e54e5f51882c4211f..13c25f29040bc886fa88b94952a5df3b9f4626ed 100644 (file)
--- a/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -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]