hholzgra Mon Jan 7 12:36:35 2002 EDT
Modified files:
/phpdoc Makefile.in
Log:
quick fixes to make it work on FreeBSD
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.86 phpdoc/Makefile.in:1.87
--- phpdoc/Makefile.in:1.86 Mon Jan 7 05:33:49 2002
+++ phpdoc/Makefile.in Mon Jan 7 12:36:35 2002
@@ -1,4 +1,4 @@
-#
+
# +----------------------------------------------------------------------+
# | PHP Version 4.0 |
# +----------------------------------------------------------------------+
@@ -17,7 +17,7 @@
#
#
-# $Id: Makefile.in,v 1.86 2002/01/07 10:33:49 hholzgra Exp $
+# $Id: Makefile.in,v 1.87 2002/01/07 17:36:35 hholzgra Exp $
#
@@ -26,16 +26,8 @@
scriptdir=@srcdir@/scripts
PHP_SOURCE=@PHP_SOURCE@
LANG=@LANG@
-ifeq (@JADE@,no)
- JADE=@ echo need jade or openjade to do this; exit;
-else
- JADE=@SP_OPTIONS@ @JADE@ -wno-idref
-endif
-ifeq (@NSGMLS@,no)
- NSGMLS=@ echo need nsgmls to do this; exit;
-else
- NSGMLS=@SP_OPTIONS@ @NSGMLS@
-endif
+JADE=@SP_OPTIONS@ @JADE@ -wno-idref
+NSGMLS=@SP_OPTIONS@ @NSGMLS@
PHP=@PHP@
CATALOG=@CATALOG@
@@ -110,14 +102,15 @@
PHPDOCDIR=$(srcdir) $(PHP) -f $(scriptdir)/revcheck.php $(LANG) > revcheck.html
funcindex.xml: quickref.txt
-ifeq ($(PHP),no)
- @echo "WARNING: recreating the function index needs php"
- @echo " which was not found by configure"
- @echo " reusing old file"
- touch funcindex.xml
-else
- $(PHP) -q -d short_tags=off $(srcdir)/scripts/genfuncindex.php ../quickref.txt
@ENCODING@ > funcindex.xml
-endif
+ @if test "$(PHP)" = "no"; then \
+ echo "WARNING: recreating the function index needs php" ;\
+ echo " which was not found by configure" ;\
+ echo " reusing old file" ;\
+ touch funcindex.xml ;\
+ else \
+ echo "$(PHP) -q -d short_tags=off $(srcdir)/scripts/genfuncindex.php
+../quickref.txt @ENCODING@ > funcindex.xml" ;\
+ $(PHP) -q -d short_tags=off $(srcdir)/scripts/genfuncindex.php ../quickref.txt
+@ENCODING@ > funcindex.xml ;\
+ fi
Makefile: $(srcdir)/Makefile.in ./config.status
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
@@ -240,7 +233,7 @@
# test all possible errors
test: manual.xml
- $(NSGMLS) -i lang-$(LANG) -s $(srcdir)/dtds/dbxml-3.1.7/phpdocxml.dcl $<
+ $(NSGMLS) -i lang-$(LANG) -s $(srcdir)/dtds/dbxml-3.1.7/phpdocxml.dcl
+manual.xml
# ignore missing IDs and check if the manual can be generated anyway
test_man_gen: manual.xml