cvs: phpdoc / Makefile.in configure.in

hholzgra Thu Jan 10 14:25:25 2002 EDT Modified files: /phpdoc configure.in Makefile.in Log: quick 'srcdir' fixes Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.111 phpdoc/configure.in:1.112 --- phpdoc/configure.in:1.111 Wed Jan 9 18:51:53 2002 +++ phpdoc/configure.in Thu Jan 10 14:25:24 2002 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.111 2002/01/09 23:51:53 hholzgra Exp $ +dnl $Id: configure.in,v 1.112 2002/01/10 19:25:24 hholzgra Exp $ dnl autoconf initialisation AC_INIT() @@ -185,9 +185,8 @@ AC_MSG_RESULT(in $withval) fi ],[ - cd dsssl - for dir1 in ../../phpdoc-tools/dsssl \ - ../phpdoc-tools/dsssl \ + for dir1 in $srcdir/phpdoc-tools/dsssl \ + $srcdir/../phpdoc-tools/dsssl \ /usr/share/sgml \ /usr/local/share/sgml \ /usr/lib/sgml \ @@ -214,7 +213,6 @@ done if test ! -z "$DOCBOOK_HTML"; then break; fi done - cd .. ]) if test -z "$DOCBOOK_HTML"; then AC_MSG_RESULT(not found) @@ -240,13 +238,12 @@ AC_MSG_RESULT(in $withval) fi ],[ - cd xsl - for dir in \ - /usr/share/sgml/docbkxsl \ - ../../phpdoc-tools/xsl/docbook \ - ../../phpdoc-tools/xsl \ - ../phpdoc-tools/xsl/docbook \ - ../phpdoc-tools/xsl + for dir in \ + $srcdir/phpdoc-tools/xsl \ + $srcdir/phpdoc-tools/xsl/docbook \ + $srcdir/../phpdoc-tools/xsl \ + $srcdir/../phpdoc-tools/xsl/docbook \ + /usr/share/sgml/docbkxsl do if test -f "$dir/html/docbook.xsl"; then DOCBOOKXSL_BIGHTML=$dir/html/docbook.xsl @@ -256,8 +253,7 @@ AC_MSG_RESULT(autodetected: $dir) break fi - done - cd .. + done ]) if test -z "$DOCBOOKXSL_BIGHTML"; then AC_MSG_RESULT(not found) @@ -325,11 +321,14 @@ if test -d "$withval" ; then PHP_SOURCE=$withval else - PHP_SOURCE=../php4 + PHP_SOURCE=$srcdir/../php4 fi ],[ - PHP_SOURCE=../php4 + PHP_SOURCE=$srcdir/../php4 ]) +if test ! -d $PHP_SOURCE; then + PHP_SOURCE=no +fi AC_MSG_RESULT($PHP_SOURCE) AC_SUBST(PHP_SOURCE) @@ -348,8 +347,8 @@ ],[ ZENDAPI="not found" for dir in \ - ./ZendAPI \ - ../ZendAPI + $srcdir/ZendAPI \ + $srcdir/../ZendAPI do if test -d "$dir"; then ZENDAPI="autodetected $dir" @@ -624,8 +623,8 @@ if test -d "$ZENDAPI"; then echo >> entities/chapters.ent echo "<!-- begin ZendAPI integration -->" >> entities/chapters.ent - echo "<!ENTITY % zend.defs SYSTEM \"./$ZENDAPI/Extending_Zend.ent\">" >> entities/chapters.ent - echo "<!ENTITY zend.api SYSTEM \"./$ZENDAPI/Extending_Zend.xml\">" >> entities/chapters.ent + echo "<!ENTITY % zend.defs SYSTEM \"$ZENDAPI/Extending_Zend.ent\">" >> entities/chapters.ent + echo "<!ENTITY zend.api SYSTEM \"$ZENDAPI/Extending_Zend.xml\">" >> entities/chapters.ent echo >> entities/chapters.ent echo "%zend.defs;" >> entities/chapters.ent echo "<!-- end ZendAPI integration -->" >> entities/chapters.ent Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.97 phpdoc/Makefile.in:1.98 --- phpdoc/Makefile.in:1.97 Tue Jan 8 17:26:34 2002 +++ phpdoc/Makefile.in Thu Jan 10 14:25:25 2002 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.97 2002/01/08 22:26:34 hholzgra Exp $ +# $Id: Makefile.in,v 1.98 2002/01/10 19:25:25 hholzgra Exp $ # all: html @@ -45,11 +45,10 @@ KDEVELOP_TOC_STYLESHEET=dsssl/kdevelop_toc.dsl XMLDCL=$(srcdir)/dtds/dbxml-3.1.7/phpdocxml.dcl -HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl dsssl/common.dsl zendapi -HOWTO_DEPS=$(HOWTO_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl dsssl/common.dsl howto/howto.ent -PRINT_DEPS=$(PRINT_STYLESHEET) dsssl/common.dsl zendapi -PHPWEB_DEPS=$(PHPWEB_STYLESHEET) dsssl/html-common.dsl dsssl/common.dsl -QUICKREF_DEPS=dsssl/quickref.dsl Makefile +HTML_DEPS=$(HTML_STYLESHEET) dsssl/html-common.dsl dsssl/html-locale.dsl.in dsssl/common.dsl.in funcindex 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 KDEVELOP_TOC_DEPS=dsssl/kdevelop_toc.dsl Makefile DIST_FILES=@MANUAL@.zip @MANUAL@.tar.gz @MANUAL@.tar.bz2 \ @@ -121,7 +120,7 @@ summary: ./funcsummary.txt quickref: quickref.txt -quickref.txt: manual.xml $(QUICKREF_DEPS) +quickref.txt: FORCE if test ! -e funcindex.xml; then touch funcindex.xml; fi $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e 's/ */ /g' | sort -f > quickref.txt @@ -224,11 +223,11 @@ # {{{ tests # test all possible errors -test: manual.xml +test: manual.xml funcindex $(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml # ignore missing IDs and check if the manual can be generated anyway -test_man_gen: manual.xml +test_man_gen: manual.xml funcindex $(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) manual.xml # }}}