summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/prog-root (renamed from progdoc)2
-rw-r--r--doc/progdoc1
-rwxr-xr-xtools/progdoc11
3 files changed, 7 insertions, 7 deletions
diff --git a/progdoc b/doc/prog-root
index 77061390..c31e5ae1 100644
--- a/progdoc
+++ b/doc/prog-root
@@ -1,5 +1,5 @@
D doc/prog-head.sgml
-C doc
+D doc/prog-intro.sgml
C nest
C conf
C filter
diff --git a/doc/progdoc b/doc/progdoc
deleted file mode 100644
index 0c3e04e5..00000000
--- a/doc/progdoc
+++ /dev/null
@@ -1 +0,0 @@
-D prog-intro.sgml
diff --git a/tools/progdoc b/tools/progdoc
index 9b27d14e..32e9771e 100755
--- a/tools/progdoc
+++ b/tools/progdoc
@@ -4,7 +4,7 @@ $srcdir = $ARGV[0];
$out = $ARGV[1];
open(OUT, ">", $out) || die "Cannot create output file";
-process($srcdir);
+process($srcdir, "doc/prog-root");
close OUT;
gen_deps();
exit 0;
@@ -21,9 +21,10 @@ sub include {
sub process {
my $dir = shift @_;
- print "$dir/progdoc\n";
- open(IN, "$dir/progdoc") || die "Unable to read $dir/progdoc";
- push(@deps, "$dir/progdoc");
+ my $doc = "$dir/" . shift @_;
+ print "$doc\n";
+ open(IN, $doc) || die "Unable to read $doc";
+ push(@deps, $doc);
my @docfile = <IN>;
close IN;
foreach $_ (@docfile) {
@@ -32,7 +33,7 @@ sub process {
/^([A-Z]+)\s*(.*)/ || die "Parse error: $_";
$cmd = $1;
$arg = $2;
- if ($cmd eq "C") { process("$dir/$arg"); }
+ if ($cmd eq "C") { process("$dir/$arg", "progdoc"); }
elsif ($cmd eq "H") {
push @stack, "H";
print OUT "<chapt>$arg\n";