doc: remove .x/ subdirectory for Xapian manpages

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

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index f26169acb7be071a4d61cbb99068a7bc7ba02ef8..925100394eab0588b453bf7b7648d3a0b4d7a34a 100644 (file)
--- 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 41de0a7277e3c38ab28cb0c5ac55c86626bf43d7..8c5f3ca8375eea59ab0af7dcc97cf7ecbfc2d894 100644 (file)
--- 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 598741706041302a7b887df28441d3603809a81e..8f1bc4b413b7d340e629522b07f690dcb61a80a8 100644 (file)
--- 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 $@+ $@'
        ];