[PHP-DOC] cvs: phpdoc / Makefile.in configure.in manual.xml.in From: Hartmut Holzgraefe (hartmut <email protected>)
Date: 01/17/02

hholzgra Thu Jan 17 06:16:21 2002 EDT

  Modified files:
    /phpdoc Makefile.in configure.in manual.xml.in
  Log:
  final docbook4 preparation
  
  configure.in: will now choose DTD id and version by checking for the
                use of <methodsynopsis>
  
  manual.xml.in: use DTD id detected by configure instead of hardcoded
  
  makefile.xml.in: use DTD version
                   make makedoc in builddir, not sourcedir
                   drop funcindex dependency for now, rethink
  
  
  
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.102 phpdoc/Makefile.in:1.103
--- phpdoc/Makefile.in:1.102 Wed Jan 16 13:36:07 2002
+++ phpdoc/Makefile.in Thu Jan 17 06:16:21 2002
@@ -17,7 +17,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.102 2002/01/16 18:36:07 hholzgra Exp $
+# $Id: Makefile.in,v 1.103 2002/01/17 11:16:21 hholzgra Exp $
 #
 
 all: html
@@ -43,12 +43,12 @@
 PRINT_STYLESHEET=dsssl/print.dsl
 QUICKREF_STYLESHEET=dsssl/quickref.dsl
 KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
-XMLDCL=$(srcdir)/dtds/dbxml-3.1.7/phpdocxml.dcl
+XMLDCL=$(srcdir)/dtds/dbxml- <email protected>@/phpdocxml.dcl
 
-HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in dsssl/common.dsl.in funcindex zendapi
+HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in dsssl/common.dsl.in zendapi
 HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in dsssl/common.dsl.in howto/howto.ent
-PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in funcindex zendapi
-PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl funcindex zendapi
+PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl.in dsssl/print.dsl.in zendapi
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl zendapi
 KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile
 
 DIST_FILES= <email protected> <email protected>  <email protected> <email protected>  <email protected> <email protected> \
@@ -129,8 +129,9 @@
         echo '<!DOCTYPE gideontoc>' > $@
         $(JADE) $(CATALOG) -d $(KDEVELOP_TOC_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e's/\& /\&amp; /g' >> $@
 
- <email protected>@/scripts/makedoc:  <email protected> <email protected>/makedoc.cc
- g++ -o  <email protected> <email protected>/makedoc  <email protected> <email protected>/makedoc.cc
+scripts/makedoc: $(scriptdir)/makedoc.cc
+ mkdir -p scripts
+ g++ -o scripts/makedoc $(scriptdir)/makedoc.cc
 
 # intermediate file for name change
 .INTERMEDIATE:  <email protected> <email protected>
@@ -147,8 +148,8 @@
          <email protected> -d php || mkdir php
         -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml $(XMLDCL) manual.xml
 
- <email protected> <email protected>:  <email protected> <email protected>  <email protected>@/scripts/makedoc
-  <email protected>@/scripts/makedoc -b  <email protected> <email protected>  <email protected> <email protected>  <email protected>@
+ <email protected> <email protected>:  <email protected> <email protected> scripts/makedoc
+ scripts/makedoc -b  <email protected> <email protected>  <email protected> <email protected>  <email protected>@
 
 # Note: Isilo converter available only in binary from www.isilo.com
  <email protected> <email protected>:  <email protected> <email protected>
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.117 phpdoc/configure.in:1.118
--- phpdoc/configure.in:1.117 Tue Jan 15 06:31:46 2002
+++ phpdoc/configure.in Thu Jan 17 06:16:21 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.117 2002/01/15 11:31:46 hholzgra Exp $
+dnl $Id: configure.in,v 1.118 2002/01/17 11:16:21 hholzgra Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -175,8 +175,17 @@
 dnl DOCBOOK_DOCTYPE="-//Davenport//DTD DocBook V3.0//EN"
 dnl AC_MSG_RESULT(defaulting to $DOCBOOK_DOCTYPE)
 dnl fi
-DOCBOOK_DOCTYPE="-//Norman Walsh//DTD DocBk XML V1.4//EN"
+
+
+if grep -q methodsynopsis en/functions/array.xml; then
+ DOCBOOK_DOCTYPE="-//OASIS//DTD DocBook XML V4.1.2//EN"
+ DOCBOOK_VERSION="4.1.2"
+else
+ DOCBOOK_DOCTYPE="-//Norman Walsh//DTD DocBk XML V3.1.7//EN"
+ DOCBOOK_VERSION="3.1.7"
+fi
 AC_SUBST(DOCBOOK_DOCTYPE)
+AC_SUBST(DOCBOOK_VERSION)
 
 dnl }}}
 
@@ -277,8 +286,6 @@
 if test -z "$DOCBOOK_HTML" -a -z "$DOCBOOKXSL_HTML"; then
   AC_MSG_ERROR(WARNING!!! NO STYLESHEETS FOUND - WON'T WORK THIS WAY)
 fi
-
-
 
 dnl {{{ check for catalog files
 
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.102 phpdoc/manual.xml.in:1.103
--- phpdoc/manual.xml.in:1.102 Fri Jan 11 04:51:36 2002
+++ phpdoc/manual.xml.in Thu Jan 17 06:16:21 2002
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding=' <email protected>@' ?>
-<!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V3.1.7//EN"
+<!DOCTYPE book PUBLIC " <email protected>@"
           " <email protected>@/dtds/dbxml-3.1.7/docbookx.dtd" [
 
 <!ENTITY % language-defs SYSTEM " <email protected>@/ <email protected>@/language-defs.ent">