about summary refs log tree commit
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-02-05 22:03:47 -0600
committerEric Wong <e@yhbt.net>2020-02-06 19:10:56 +0000
commit8e15cbdbe35671c7e3c10573638ed4dcc7ce7a4f (patch)
tree7d5f5064e5428bd506be601d16899c276cca4ff3
parent6864cdba2bb65069d15d26e0b9af6ade8edd0ec3 (diff)
downloadpublic-inbox-8e15cbdbe35671c7e3c10573638ed4dcc7ce7a4f.tar.gz
There's no need to keep Xapian manpage renderings in a separate
subdirectory, after all.

Eliminating this difference between the local FS and URL path
will allow relative URLs to the Xapian manpages in our local
HTML documentation to work smoothly, since there was never any
".x/" path component for files served from public-inbox.org
-rw-r--r--Documentation/.gitignore2
-rw-r--r--Documentation/include.mk3
-rw-r--r--Makefile.PL6
3 files changed, 4 insertions, 7 deletions
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index f26169ac..92510039 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -1,4 +1,4 @@
 /public-inbox-*.txt
 /public-inbox.cgi.txt
 /standards.txt
-/.x
+/.*.txt
diff --git a/Documentation/include.mk b/Documentation/include.mk
index 41de0a72..8c5f3ca8 100644
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@ -89,9 +89,6 @@ check :: NEWS .NEWS.atom.check NEWS.html
 
 html: $(docs_html)
 
-Documentation/.x:
-        mkdir -p $@
-
 doc: $(docs)
 
 %.gz: %
diff --git a/Makefile.PL b/Makefile.PL
index 59874170..8f1bc4b4 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -71,10 +71,10 @@ $v->{rsync_docs} = [ @{$v->{gz_docs}}, @{$v->{docs}},
 # external manpages which we host ourselves, since some packages
 # (currently just Xapian) doesn't host manpages themselves.
 my @xman = qw(copydatabase.1 xapian-compact.1);
-$v->{xdocs} = [ map { "Documentation/.x/.$_.txt" } @xman ];
-$v->{xdocs_html} = [ map { "Documentation/.x/.$_.html" } @xman ];
+$v->{xdocs} = [ map { "Documentation/.$_.txt" } @xman ];
+$v->{xdocs_html} = [ map { "Documentation/.$_.html" } @xman ];
 for (@{$v->{xdocs}}) {
-        $t->{"$_ : | Documentation/.x"} = [
+        $t->{"$_:"} = [
                 '$(PERL) -w Documentation/extman.perl $@ >$@+',
                 'mv $@+ $@'
         ];