sniper Thu Oct 13 06:02:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/sapi/cli Makefile.frag
/php-src/scripts Makefile.frag
Log:
- 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.2027.2.123&r2=1.2027.2.124&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.123 php-src/NEWS:1.2027.2.124
--- php-src/NEWS:1.2027.2.123 Thu Oct 13 06:01:59 2005
+++ php-src/NEWS Thu Oct 13 06:02:58 2005
@@ -43,6 +43,8 @@
- 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
http://cvs.php.net/diff.php/php-src/sapi/cli/Makefile.frag?r1=1.4&r2=1.4.4.1&ty=u
Index: php-src/sapi/cli/Makefile.frag
diff -u php-src/sapi/cli/Makefile.frag:1.4
php-src/sapi/cli/Makefile.frag:1.4.4.1
--- php-src/sapi/cli/Makefile.frag:1.4 Tue Sep 2 17:41:01 2003
+++ php-src/sapi/cli/Makefile.frag Thu Oct 13 06:02:59 2005
@@ -8,4 +8,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.24.2.1&r2=1.24.2.2&ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.24.2.1
php-src/scripts/Makefile.frag:1.24.2.2
--- php-src/scripts/Makefile.frag:1.24.2.1 Wed Aug 31 03:00:22 2005
+++ php-src/scripts/Makefile.frag Thu Oct 13 06:02:59 2005
@@ -22,7 +22,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)/"
@@ -53,14 +53,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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
