bjori Mon Jan 22 16:01:21 2007 UTC
Modified files:
/phpdoc Makefile.in configure.in
Log:
Update paths
http://cvs.php.net/viewvc.cgi/phpdoc/Makefile.in?r1=1.176&r2=1.177&diff_format=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.176 phpdoc/Makefile.in:1.177
--- phpdoc/Makefile.in:1.176 Fri Jan 19 20:14:12 2007
+++ phpdoc/Makefile.in Mon Jan 22 16:01:20 2007
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.176 2007/01/19 20:14:12 bjori Exp $
+# $Id: Makefile.in,v 1.177 2007/01/22 16:01:20 bjori Exp $
#
all: html
@@ -40,25 +40,32 @@
[EMAIL PROTECTED]@
-HTML_STYLESHEET=dsssl/html.dsl
-PHPWEB_STYLESHEET=dsssl/phpweb.dsl
-HOWTO_STYLESHEET=dsssl/howto.dsl
-HOWTOPHP_STYLESHEET=dsssl/howto-php.dsl
-PRINT_STYLESHEET=dsssl/print.dsl
-KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl
-XMLDCL=$(srcdir)/dtds/dbxml-4.1.2/phpdocxml.dcl
-
-CHM_XSL_SHEET=xsl/htmlhelp.xsl
-HOWTO_XSL_SHEET=xsl/howto.xsl
-QUICKREF_XSL_SHEET=xsl/quickref.xsl
-XUL_XSL_SHEET=xsl/htmlhelp.xsl
-
-BIGHTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in zendapi
-HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in
dsssl/common.dsl.in zendapihtml
-HOWTO_DEPS=$(HOWTO_STYLESHEET) $(HOWTOPHP_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 zendapi
-PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl
zendapiphp
-KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile
+
+PHPBOOK=phpbook
+PHPDSSSL=$(PHPBOOK)/phpbook-dsssl
+PHPXML=$(PHPBOOK)/phpbook-xml
+PHPXSL=$(PHPBOOK)/phpbook-xsl
+
+HTML_STYLESHEET=$(PHPDSSSL)/html.dsl
+PHPWEB_STYLESHEET=$(PHPDSSSL)/phpweb.dsl
+HOWTO_STYLESHEET=$(PHPDSSSL)/howto.dsl
+HOWTOPHP_STYLESHEET=$(PHPDSSSL)/howto-php.dsl
+PRINT_STYLESHEET=$(PHPDSSSL)/print.dsl
+KDEVELOP_TOC_STYLESHEET=$(PHPDSSSL)/kdevelop_toc.dsl
+
+XMLDCL=$(PHPXML)/phpdocxml.dcl
+
+CHM_XSL_SHEET=$(PHPXSL)/htmlhelp.xsl
+HOWTO_XSL_SHEET=$(PHPXSL)/howto.xsl
+QUICKREF_XSL_SHEET=$(PHPXSL)/quickref.xsl
+XUL_XSL_SHEET=$(PHPXSL)/htmlhelp.xsl
+
+BIGHTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in zendapi
+HTML_DEPS=$(HTML_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/html-locale.dsl.in $(PHPDSSSL)/common.dsl.in zendapihtml
+HOWTO_DEPS=$(HOWTO_STYLESHEET) $(HOWTOPHP_STYLESHEET)
$(PHPDSSSL)/html-common.dsl $(PHPDSSSL)/html-locale.dsl.in
$(PHPDSSSL)/common.dsl.in howto/howto.ent
+PRINT_DEPS=$(PRINT_STYLESHEET) $(PHPDSSSL)/common.dsl.in
$(PHPDSSSL)/print.dsl.in zendapi
+PHPWEB_DEPS=$(PHPWEB_STYLESHEET) $(PHPDSSSL)/html-common.dsl
$(PHPDSSSL)/common.dsl zendapiphp
+KDEVELOP_TOC_DEPS=$(KDEVELOP_TOC_STYLESHEET) Makefile
[EMAIL PROTECTED]@.tar.gz @[EMAIL PROTECTED]
MIRROR_TARGETS=php/index.php html/index.html $(DIST_FILES)
@@ -201,16 +208,16 @@
# still needs more tweaks!!
html_xsl: manual.xml zendapihtml
- ${XSLTPROC} xsl/html.xsl manual.xml
+ ${XSLTPROC} $(PHPXSL)/html.xsl manual.xml
xul_xsl: manual.xml zendapixul
${XSLTPROC} xsl/xul.xsl manual.xml
bightml_xsl: manual.xml zendapi
- ${XSLTPROC} -o @[EMAIL PROTECTED] xsl/bightml.xsl manual.xml
+ ${XSLTPROC} -o @[EMAIL PROTECTED] $(PHPXSL)/bightml.xsl manual.xml
fo: manual.xml zendapi
- ${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
+ ${XSLTPROC} -o manual.fo $(PHPXSL)/fo.xsl manual.xml
howto_xsl:
rm -rf ./howto/html && mkdir ./howto/html
@@ -220,7 +227,7 @@
${XSLTPROC} $(CHM_XSL_SHEET) manual.xml
phpweb_xsl: manual.xml zendapiphp
- ${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
+ ${XSLTPROC} $(PHPXSL)/phpweb.xsl manual.xml
$(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
@@ -263,7 +270,7 @@
tar -cvzf $@ howto/html/*.html
install.html: install.xml $(HTML_DEPS)
- $(JADE) $(CATALOG) -V nochunks -d dsssl/install.dsl -t sgml $(XMLDCL)
install.xml > $@
+ $(JADE) $(CATALOG) -V nochunks -d $(PHPDSSSL)/install.dsl -t sgml
$(XMLDCL) install.xml > $@
chm: html FORCE
chm/make_chm.bat $(LANG)
http://cvs.php.net/viewvc.cgi/phpdoc/configure.in?r1=1.238&r2=1.239&diff_format=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.238 phpdoc/configure.in:1.239
--- phpdoc/configure.in:1.238 Fri Sep 29 16:37:40 2006
+++ phpdoc/configure.in Mon Jan 22 16:01:20 2007
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.238 2006/09/29 16:37:40 nlopess Exp $
+dnl $Id: configure.in,v 1.239 2007/01/22 16:01:20 bjori Exp $
dnl autoconf initialisation
AC_INIT()
@@ -315,9 +315,9 @@
AC_MSG_RESULT(in $withval)
fi
],[
- DOCBOOK_HTML="$srcdir/dsssl/docbook/html/docbook.dsl"
- DOCBOOK_PRINT="$srcdir/dsssl/docbook/print/docbook.dsl"
- AC_MSG_RESULT([$srcdir/dsssl/docbook (default)])
+ DOCBOOK_HTML="$srcdir/docbook/docbook-dsssl/html/docbook.dsl"
+ DOCBOOK_PRINT="$srcdir/docbook/docbook-dsssl/print/docbook.dsl"
+ AC_MSG_RESULT([$srcdir/docbook/docbook-dsssl (default)])
])
if test -z "$DOCBOOK_HTML"; then
AC_MSG_RESULT(not found)
@@ -344,7 +344,7 @@
dnl DSSSL catalog file
if test -e $srcdir/dsssl/docbook/catalog
then
- CATALOG="$CATALOG -c $srcdir/dsssl/docbook/catalog"
+ CATALOG="$CATALOG -c $srcdir/docbook/docbook-dsssl/catalog"
fi
dnl For windows (and maybe *nix too?) users lacking catalog-files
