Hi,
attached patch makes use of and add full support for INIPATH.
INIPATH was introduced some time ago in configure.in.
Testing the new installpart, I found that not the php.ini from ./scripts was
used, instead my own php.ini (which has disabled shorttags).
If nobody complain, I will commit this changes.
Friedhelm
Index: Makefile.in
===================================================================
RCS file: /repository/phpdoc/Makefile.in,v
retrieving revision 1.149
diff -u -r1.149 Makefile.in
--- Makefile.in 29 Apr 2004 15:19:26 -0000 1.149
+++ Makefile.in 15 Jun 2004 13:27:54 -0000
@@ -27,6 +27,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/scripts
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -111,7 +112,7 @@
$(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) > funcsummary.txt
revcheck.html: FORCE
- PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php $(LANGDIR) > revcheck.html
+ PHPDOCDIR=$(srcdir) $(PHP) -c $(INIPATH) -f $(scriptdir)/revcheck.php $(LANGDIR) > revcheck.html
funcindex.xml: FORCE
@if test "$(PHP)" = "no"; then \
@@ -121,8 +122,8 @@
touch funcindex.xml ;\
else \
$(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml $(XMLDCL) manual.xml | sed -e 's/ */ /g' | sort -f > quickref-temp.txt ;\
- echo "$(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml" ;\
- $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml ;\
+ echo "$(PHP) -c $(INIPATH) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml" ;\
+ $(PHP) -c $(INIPATH) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt > funcindex.xml ;\
rm -f quickref-temp.txt ;\
fi
@@ -136,8 +137,8 @@
tar -cvzf $@ @[EMAIL PROTECTED] html/*.html @[EMAIL PROTECTED] @[EMAIL PROTECTED]
status: ./funclist.txt
- $(PHP) -q $(scriptdir)/checkdoc.php > status.txt
- $(PHP) -q $(scriptdir)/checkdoc.php missing > missing.txt
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/checkdoc.php > status.txt
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/checkdoc.php missing > missing.txt
summary: ./funcsummary.txt
@@ -165,10 +166,10 @@
html/index.html: manual.xml $(HTML_DEPS)
@test -d html || mkdir html
- $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
+ $(PHP) -c $(INIPATH) -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/
- $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/html_syntax.php html html/
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
$(HACK_RTL_LANGS_PAGES)
# still needs more tweaks!!
@@ -189,16 +190,16 @@
phpweb_xsl: manual.xml zendapiphp
@test -d php || mkdir php
${XSLTPROC} $(srcdir)/xsl/phpweb.xsl manual.xml
- $(PHP) -q $(scriptdir)/fixphpweb.php `pwd`/php
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/fixphpweb.php `pwd`/php
php/index.php: manual.xml $(PHPWEB_DEPS)
- $(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/phpweb-entities.php `pwd` phpweb
@test -d php || mkdir php
- $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php $(LANGDIR)
+ $(PHP) -c $(INIPATH) -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/
- $(PHP) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
- $(PHP) -q $(scriptdir)/phpweb-entities.php `pwd` remove
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/html_syntax.php php php/
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/rtlpatch/hackmanuallang.php en
+ $(PHP) -c $(INIPATH) -q $(scriptdir)/phpweb-entities.php `pwd` remove
$(HACK_RTL_LANGS_PHPWEB)
palmdoc: @[EMAIL PROTECTED]
