jimw Wed Jan 10 20:15:08 2001 EDT
Modified files:
/phpdoc Makefile.in configure.in manual.xml.in
Log:
clean up building from seperate directory
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.47 phpdoc/Makefile.in:1.48
--- phpdoc/Makefile.in:1.47 Fri Dec 15 00:58:52 2000
+++ phpdoc/Makefile.in Wed Jan 10 20:15:08 2001
@@ -26,7 +26,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.47 2000/12/15 08:58:52 hholzgra Exp $
+# $Id: Makefile.in,v 1.48 2001/01/11 04:15:08 jimw Exp $
#
VPATH=@srcdir@
@@ -58,19 +58,19 @@
manual.prc manual.txt.gz
MIRROR_TARGETS=php/manual.php $(DIST_FILES) html/manual.html
-html.dsl: html.dsl.in ./config.status
+html.dsl: $(srcdir)/html.dsl.in ./config.status
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-print.dsl: print.dsl.in ./config.status
+print.dsl: $(srcdir)/print.dsl.in ./config.status
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-phpweb.dsl: phpweb.dsl.in ./config.status
+phpweb.dsl: $(srcdir)/phpweb.dsl.in ./config.status
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-common.dsl: common.dsl.in ./config.status
+common.dsl: $(srcdir)/common.dsl.in ./config.status
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-manual.xml: manual.xml.in .manual.xml
+manual.xml: $(srcdir)/manual.xml.in .manual.xml
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
.manual.xml: $(DEPEND_FILES) global.ent
@@ -112,20 +112,20 @@
tar -cvzf $@ bigmanual.html html/*.html manual.rtf manual.txt
status: checkdoc ./funclist.txt
- $(srcdir)/checkdoc -s > $(srcdir)/status.txt
- $(srcdir)/checkdoc -m > $(srcdir)/missing.txt
+ ./checkdoc -s > status.txt
+ ./checkdoc -m > missing.txt
summary: ./funcsummary.txt
quickref: quickref.txt
-quickref.txt: $(srcdir)/manual.xml $(QUICKREF_DEPS)
- $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml
$(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml | sed -e 's/ */ /g' | sort -f >
quickref.txt
+quickref.txt: manual.xml $(QUICKREF_DEPS)
+ $(JADE) $(CATALOG) -d $(QUICKREF_STYLESHEET) -V nochunks -t sgml
+$(srcdir)/phpdocxml.dcl manual.xml | sed -e 's/ */ /g' | sort -f > quickref.txt
-makedoc: makedoc.cc
- g++ -o makedoc makedoc.cc
+makedoc: $(srcdir)/makedoc.cc
+ g++ -o makedoc $(srcdir)/makedoc.cc
-bigmanual.html: $(srcdir)/manual.xml $(HTML_DEPS)
- $(JADE) $(CATALOG) -V nochunks -d $(HTML_STYLESHEET) -t sgml
$(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml > $@
+bigmanual.html: manual.xml $(HTML_DEPS)
+ $(JADE) $(CATALOG) -V nochunks -d $(HTML_STYLESHEET) -t sgml
+$(srcdir)/phpdocxml.dcl manual.xml > $@
bigmanual.html.gz: bigmanual.html
gzip -c $< > $@
@@ -136,17 +136,17 @@
manual.txt.gz: manual.txt
gzip -c $< > $@
-html/manual.html: $(srcdir)/manual.xml $(HTML_DEPS)
+html/manual.html: manual.xml $(HTML_DEPS)
@test -d html || mkdir html
- $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
$(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml
+ $(JADE) $(CATALOG) -d $(HTML_STYLESHEET) -V use-output-dir -t sgml
+$(srcdir)/phpdocxml.dcl manual.xml
-php/index.php: $(srcdir)/manual.xml $(PHPWEB_DEPS)
+php/index.php: manual.xml $(PHPWEB_DEPS)
@test -d php || mkdir php
- -$(JADE) $(CATALOG) -d $(PHP_STYLESHEET) -V use-output-dir -t sgml
$(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml
+ -$(JADE) $(CATALOG) -d $(PHP_STYLESHEET) -V use-output-dir -t sgml
+$(srcdir)/phpdocxml.dcl manual.xml
-php/manual.php: $(srcdir)/manual.xml $(PHPWEB_DEPS)
+php/manual.php: manual.xml $(PHPWEB_DEPS)
@test -d php || mkdir php
- -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
$(srcdir)/phpdocxml.dcl $(srcdir)/manual.xml
+ -$(JADE) $(CATALOG) -d $(PHPWEB_STYLESHEET) -V use-output-dir -t sgml
+$(srcdir)/phpdocxml.dcl manual.xml
manual.txt: bigmanual.html
lynx -nolist -dump file:`pwd`/bigmanual.html > manual.txt
@@ -154,10 +154,10 @@
manual.prc: manual.txt makedoc
./makedoc -b manual.txt manual.prc 'PHP Manual'
-manual.zip: $(srcdir)/html/manual.html
+manual.zip: html/manual.html
-rm -f $@ && (cd html; zip -9 -q ../$@ *.html)
-manual.tar.gz: $(srcdir)/html/manual.html
+manual.tar.gz: html/manual.html
-rm -f $@ && (cd html; tar -cf - *.html) | gzip > manual.tar.gz
howto.html: $(srcdir)/howto.xml $(HOWTO_DEPS) global.ent
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.44 phpdoc/configure.in:1.45
--- phpdoc/configure.in:1.44 Fri Jan 5 17:34:24 2001
+++ phpdoc/configure.in Wed Jan 10 20:15:08 2001
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.44 2001/01/06 01:34:24 hirokawa Exp $
+dnl $Id: configure.in,v 1.45 2001/01/11 04:15:08 jimw Exp $
AC_INIT(global.ent)
@@ -57,7 +57,7 @@
/usr/local/lib/sgml/stylesheets/nwalsh-modular \
/usr/local/lib/sgml/docbook \
/usr/local/share/sgml/docbook/dsssl/modular ; do
- if test -d "$dir"; then
+ if test -d "$srcdir/$dir"; then
DOCBOOK_HTML="$dir/html/docbook.dsl"
DOCBOOK_PRINT="$dir/print/docbook.dsl"
AC_MSG_RESULT(in $dir)
@@ -100,7 +100,7 @@
LANG=en
AC_MSG_RESULT([en (default)])
else
- if test ! -d "$withval"; then
+ if test ! -d "$srcdir/$withval"; then
AC_MSG_RESULT()
AC_MSG_ERROR(Language \"$withval\" not supported!)
fi
@@ -244,14 +244,14 @@
DEPEND_FILES=""
rm -f chapters.ent
echo "<!-- DON'T TOUCH - AUTOGENERATED BY ./configure -->" > chapters.ent
-for file in `find en -name "*.xml" | sed -e"s/^en\///g" | sort`
+for file in `find $srcdir/en -name "*.xml" | sed -e"s/^$srcdir\/en\///g" | sort`
do
name=`echo $file | sed -e"s/\//./g" -e"s/.xml$//g"`
- if test -f $LANG/$file
+ if test -f $srcdir/$LANG/$file
then
- file=$LANG/$file
+ file=$srcdir/$LANG/$file
else
- file=en/$file
+ file=$srcdir/en/$file
echo " untranslated $file"
fi
DEPEND_FILES="$DEPEND_FILES $file"
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.42 phpdoc/manual.xml.in:1.43
--- phpdoc/manual.xml.in:1.42 Tue Dec 26 06:40:00 2000
+++ phpdoc/manual.xml.in Wed Jan 10 20:15:08 2001
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='@ENCODING@' ?>
<!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V1.7//EN"
- "dbxml/docbookx.dtd" [
+ "@srcdir@/dbxml/docbookx.dtd" [
-<!ENTITY % language-defs SYSTEM "@LANG@/language-defs.ent">
+<!ENTITY % language-defs SYSTEM "@srcdir@/@LANG@/language-defs.ent">
%language-defs;
<!-- Defaults for entities that should be defined in language-defs -->
-<!ENTITY % global.entities SYSTEM "global.ent">
+<!ENTITY % global.entities SYSTEM "@srcdir@/global.ent">
<!-- These are language independent -->
<!ENTITY % build.version SYSTEM "version.ent">
