techtonik Thu Mar 3 15:42:32 2005 EDT
Modified files:
/phpdoc configure.in Makefile.in
Log:
fix bug #31932 : images are missing in the manual
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.218&r2=1.219&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.218 phpdoc/configure.in:1.219
--- phpdoc/configure.in:1.218 Tue Mar 1 12:28:40 2005
+++ phpdoc/configure.in Thu Mar 3 15:42:30 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
+dnl $Id: configure.in,v 1.219 2005/03/03 20:42:30 techtonik Exp $
dnl autoconf initialisation
AC_INIT()
@@ -524,15 +524,15 @@
])
if test -d "$ZENDAPI"; then
- ZEND_FIGURES="cp -r $ZENDAPI/figures ."
- ZEND_FIGURES_HTML="$ZEND_FIGURES/html"
- ZEND_FIGURES_PHP="$ZEND_FIGURES/php"
FIGURES="figures"
+ ZEND_FIGURES="cp $ZENDAPI/figures/*.png ."
+ ZEND_FIGURES_HTML="$ZEND_FIGURES/html/$FIGURES"
+ ZEND_FIGURES_PHP="$ZEND_FIGURES/php/$FIGURES"
else
+ FIGURES=""
ZEND_FIGURES=""
ZEND_FIGURES_HTML=""
ZEND_FIGURES_PHP=""
- FIGURES=""
fi
AC_MSG_RESULT($ZENDAPI)
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.159&r2=1.160&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.159 phpdoc/Makefile.in:1.160
--- phpdoc/Makefile.in:1.159 Fri Feb 11 10:57:49 2005
+++ phpdoc/Makefile.in Thu Mar 3 15:42:31 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.159 2005/02/11 15:57:49 derick Exp $
+# $Id: Makefile.in,v 1.160 2005/03/03 20:42:31 techtonik Exp $
#
all: html
@@ -84,11 +84,11 @@
@ZEND_FIGURES@
zendapihtml:
- rm -rf html && mkdir html
+ rm -rf html && mkdir html && mkdir html/@FIGURES@
@ZEND_FIGURES_HTML@
zendapiphp:
- rm -rf php && mkdir php
+ rm -rf php && mkdir php && mkdir php/@FIGURES@
@ZEND_FIGURES_PHP@
html: html/index.html
@@ -167,8 +167,6 @@
@[EMAIL PROTECTED]: @[EMAIL PROTECTED] $(BIGHTML_DEPS)
html/index.html: manual.xml $(HTML_DEPS)
- rm -rf html && mkdir html
- @ZEND_FIGURES_HTML@
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
$(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php html html/
@@ -177,8 +175,6 @@
# still needs more tweaks!!
html_xsl: manual.xml zendapihtml
- rm -rf html && mkdir html
- @ZEND_FIGURES_HTML@
${XSLTPROC} xsl/html.xsl manual.xml
bightml_xsl: manual.xml zendapi
@@ -192,17 +188,16 @@
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
chm_xsl: manual.xml
- rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
+ rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
./htmlhelp/html/@FIGURES@
+ @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
- rm -rf php && mkdir php
${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
$(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
- rm -rf php && mkdir php
$(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
-$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(XMLDCL) manual.xml
$(PHP) -q $(scriptdir)/html_syntax.php php php/
