From 4809310fff8d022a37c60f73ae9d602e426bc6a4 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Thu, 13 Oct 2005 10:04:53 +0000
Subject: [PATCH] MFH: - Fixed bug #34850 (--program-suffix and
 --program-prefix not included in man page names)

---
 NEWS                   |  2 ++
 sapi/cli/Makefile.frag |  2 +-
 scripts/Makefile.frag  | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index cae7ad0d56..79408c7c89 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Oct 2005, Version 4.4.1
 - Fixed a memory corruption bug regarding included files. (Derick)
+- Fixed bug #34850 (--program-suffix and --program-prefix not included in 
+  man page names). (Jani)
 - Fixed bug #34790 (preg_match_all(), named capturing groups, variable
   assignment/return => crash). (Dmitry)
 - Fixed bug #34742 (ftp wrapper failures caused from segmented command 
diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag
index df6c86f2f2..5a25ba12e2 100644
--- a/sapi/cli/Makefile.frag
+++ b/sapi/cli/Makefile.frag
@@ -6,4 +6,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 80f35811ff..e1e5127fbb 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -21,7 +21,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)/"
@@ -69,14 +69,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
-- 
2.40.0