- Fixed bug #34850 (--program-suffix and --program-prefix not included in man page...

diff --git a/NEWS b/NEWS
index 4b693e9e14c4ee6a00054610f9766a758025cc7d..badcd181dd42d61e9b3277614c15c13537cdf3ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,8 @@ PHP                                                                        NEWS
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34850 (--program-suffix and --program-prefix not included in
+  man page names). (Jani)
 - Fixed bug #34818 (several functions crash when invalid mysqli_link object 
   is passed). (Tony)
 - Fixed bug #34810 (mysqli::init() and others use wrong $this pointer

diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag
index 5db4c68baf3391c3c749ae1c3cbdacfb45b55899..6903ca1fc0c7d77b09f5a12d040a28dd104bfa5a 100644 (file)
--- a/sapi/cli/Makefile.frag
+++ b/sapi/cli/Makefile.frag
@@ -8,4 +8,4 @@ install-cli: $(SAPI_CLI_PATH)
        @$(INSTALL_CLI)
        @echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
        @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
-       @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1
+       @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 93c48bec0baf89a6f853b7db3943b68dff8a000a..61783d777d99e7c83ea8649df607f74799b8821f 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -22,7 +22,7 @@ BUILD_FILES_EXEC = \
        config.sub
 
 bin_SCRIPTS = phpize php-config
-man_PAGES = phpize.1 php-config.1
+man_PAGES = phpize php-config
 
 install-build:
        @echo "Installing build environment:     $(INSTALL_ROOT)$(phpbuilddir)/"
@@ -53,14 +53,14 @@ install-headers:
 install-programs: $(builddir)/phpize $(builddir)/php-config
        @echo "Installing helper programs:       $(INSTALL_ROOT)$(bindir)/"
        @for prog in $(bin_SCRIPTS); do \
-               echo "  program: $(program_prefix)$$prog$(program_suffix)"; \
-               $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \
+               echo "  program: $(program_prefix)$${prog}$(program_suffix)"; \
+               $(INSTALL) -m 755 $(builddir)/$${prog} $(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
        done
        @echo "Installing man pages:             $(INSTALL_ROOT)$(mandir)/man1/"
        @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
        @for page in $(man_PAGES); do \
-               echo "  page: $$page"; \
-               $(INSTALL_DATA) $(builddir)/man1/$$page $(INSTALL_ROOT)$(mandir)/man1/$$page; \
+               echo "  page: $(program_prefix)$${page}$(program_suffix).1"; \
+               $(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
        done
        
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status