nlopess Sun Mar 20 09:49:17 2005 EDT
Modified files:
/phpdoc Makefile.in configure.in
Log:
try to fix remaining encoding issues
fix xchm/xsl generation
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.162&r2=1.163&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.162 phpdoc/Makefile.in:1.163
--- phpdoc/Makefile.in:1.162 Tue Mar 8 14:51:13 2005
+++ phpdoc/Makefile.in Sun Mar 20 09:49:17 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.162 2005/03/08 19:51:13 nlopess Exp $
+# $Id: Makefile.in,v 1.163 2005/03/20 14:49:17 nlopess Exp $
#
all: html
@@ -190,8 +190,11 @@
${XSLTPROC} $(HOWTO_XSL_SHEET) ./howto/howto.xml
chm_xsl: manual.xml
- rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html && mkdir
./htmlhelp/html/@FIGURES@
- @ZEND_FIGURES@/htmlhelp/html/@FIGURES@
+ rm -rf ./htmlhelp/html && mkdir ./htmlhelp/html
+ @if test "@FIGURES@" != ""; then \
+ mkdir ./htmlhelp/html/@FIGURES@ ;\
+ @ZEND_FIGURES@/htmlhelp/html/@FIGURES@ ;\
+ fi
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.222&r2=1.223&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.222 phpdoc/configure.in:1.223
--- phpdoc/configure.in:1.222 Wed Mar 16 03:11:47 2005
+++ phpdoc/configure.in Sun Mar 20 09:49:17 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.222 2005/03/16 08:11:47 leszek Exp $
+dnl $Id: configure.in,v 1.223 2005/03/20 14:49:17 nlopess Exp $
dnl autoconf initialisation
AC_INIT()
@@ -716,7 +716,6 @@
echo "saving trees: $TREESAVING";
case "$LANG" in
- ja|ko|pt_BR|pl|ru) ENCODING="UTF-8";;
zh_tw|zh_hk) ENCODING="big5";;
zh_cn) ENCODING="gb2312";;
cs|hu|ro|sk) ENCODING="ISO-8859-2";;
@@ -729,7 +728,6 @@
if test "$LANG_HACK_FOR_HE" = "yes"; then
ENCODING="ISO-8859-8"
fi
-AC_SUBST(ENCODING)
dnl localize the PalmPilot DOC title
case "$LANG" in
@@ -766,6 +764,8 @@
;;
esac
+ENCODING="UTF-8"
+AC_SUBST(ENCODING)
AC_SUBST(SP_OPTIONS)
AC_SUBST(HTMLHELP_ENCODING)
