cvs: php-src(PHP_4_4) / NEWS /sapi/cli Makefile.frag /scripts Makefile.frag

sniper Thu Oct 13 06:04:53 2005 EDT Modified files: (Branch: PHP_4_4) /php-src NEWS /php-src/sapi/cli Makefile.frag /php-src/scripts Makefile.frag Log: MFH: - Fixed bug #34850 (--program-suffix and --program-prefix not included in man page names) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.56&r2=1.1247.2.920.2.57&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.56 php-src/NEWS:1.1247.2.920.2.57 --- php-src/NEWS:1.1247.2.920.2.56 Wed Oct 12 07:08:40 2005 +++ php-src/NEWS Thu Oct 13 06:04:51 2005 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? 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 http://cvs.php.net/diff.php/php-src/sapi/cli/Makefile.frag?r1=1.1.2.2&r2=1.1.2.2.8.1&ty=u Index: php-src/sapi/cli/Makefile.frag diff -u php-src/sapi/cli/Makefile.frag:1.1.2.2 php-src/sapi/cli/Makefile.frag:1.1.2.2.8.1 --- php-src/sapi/cli/Makefile.frag:1.1.2.2 Tue Feb 11 23:39:30 2003 +++ php-src/sapi/cli/Makefile.frag Thu Oct 13 06:04:53 2005 @@ -6,4 +6,4 @@ @$(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 http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.11.2.4&r2=1.1.2.11.2.5&ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.11.2.4 php-src/scripts/Makefile.frag:1.1.2.11.2.5 --- php-src/scripts/Makefile.frag:1.1.2.11.2.4 Wed Jun 8 06:34:41 2005 +++ php-src/scripts/Makefile.frag Thu Oct 13 06:04:53 2005 @@ -21,7 +21,7 @@ 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-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