documentation.html now generated from other files.
PR:
Obtained from:
Submitted by:
Reviewed by:
diff --git a/Makefile b/Makefile
index 523a23d..a2a8769 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,10 @@
all: builddtcl_test shared
-static: $(OBJECTS) docs/documentation.txt
+static: $(OBJECTS) docs/documentation.html
$(TCL_STLIB_LD) $(STATICLIB) $(OBJECTS)
-shared: $(OBJECTS) docs/documentation.txt
+shared: $(OBJECTS) docs/documentation.html
$(TCL_SHLIB_LD) -o $(SHLIB) $(OBJECTS) $(TCL_LIB_SPEC) $(TCL_LIBS)
# I don't have too many C files, so it's just clearer to do things by
@@ -45,13 +45,16 @@
$(COMPILE)
clean:
- -rm -f $(STATICLIB) $(SHLIB) *.o *~ docs/documentation.txt
+ -rm -f $(STATICLIB) $(SHLIB) *.o *~ docs/documentation.txt docs/documentation.html
version:
./cvsversion.tcl
+docs/documentation.html:
+ $(TCLSH) ./docs/split.tcl docs/install.html docs/directives.html docs/commands.html docs/other.html > docs/documentation.html
+
docs/documentation.txt:
- if test -x `which lynx` ; then lynx -dump ./docs/documentation.html > ./docs/documentation.txt ; else echo "You need lynx to create documentation.txt from documentation.html" ; fi
+ if test -x `which html2text` ; then html2text ./docs/documentation.html > ./docs/documentation.txt ; else echo "You need html2text to create documentation.txt from documentation.html" ; fi
dist: clean docs/documentation.txt version
(cd .. ; tar -czvf mod_dtcl-`cat mod_dtcl/VERSION`.tar.gz mod_dtcl/ ; )
diff --git a/builddtcl.sh b/builddtcl.sh
index 30746f5..8aa65ba 100755
--- a/builddtcl.sh
+++ b/builddtcl.sh
@@ -59,6 +59,7 @@
echo "Using tclConfig.sh: $CONFIG"
. $CONFIG
+export TCLSH
export TCL_CC
export TCL_CFLAGS_DEBUG
export TCL_CFLAGS_OPTIMIZE
diff --git a/docs/documentation.html b/docs/documentation.html
deleted file mode 100644
index 0cf622f..0000000
--- a/docs/documentation.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- $Id$ -->
-
- <!-- The load dtd is so that I can work on the documentation
- with emacs' SGML in all its glory - davidw -->
-
- <!-- Local Variables: -->
- <!-- eval: (sgml-load-dtd "~/html.ced") -->
- <!-- End: -->
-
\ No newline at end of file
diff --git a/docs/documentation.txt b/docs/documentation.txt
deleted file mode 100644
index 8208202..0000000
--- a/docs/documentation.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/docs/index.html b/docs/index.html
index 5d72778..58c53d8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,14 +4,12 @@
<title>mod_dtcl documentation</title>
<link rel="stylesheet" href="style.css">
</head>
-
- <frameset rows="80,*">
+ <frameset rows="80,*">
<frame frameborder=0 src="top.html">
<frameset cols="120,*">
<frame frameborder=0 src="nav.html">
<frame frameborder=0 name="right" src="commands.html">
</frameset>
</frameset>
- </body>
</html>
<!-- $Id$ -->
