Fix man page automation for catalyst 3.x ("arch/" vs. "modules/catalyst/arch")

diff --git a/Makefile b/Makefile
index 83fbd5afb8df1fa36b25546981a8a4fca97ce8b7..bb8a22875ef39e9c05835295eb8c0025b2210400 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ files/catalyst.1: doc/catalyst.1.txt doc/subarches.generated.txt doc/asciidoc.co
        a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
                 --format=manpage -D files "$<"
 
-doc/subarches.generated.txt: $(wildcard arch/*.py)
+doc/subarches.generated.txt: $(wildcard modules/catalyst/arch/*.py)
        ./doc/make_subarch_table_guidexml.py
 
 clean:

diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py
index 22e6c6dd71a9f4557c7935716792609596e23eba..94c4af0d53a321c90a6c630390012467a32da59e 100755 (executable)
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -101,7 +101,7 @@ if __name__ == '__main__':
        subarch_title_to_subarch_id = dict()
        subarch_id_to_pattern_arch_genericrch_id = dict()
 
-       for (dirpath, dirnames, filenames) in os.walk('arch'):
+       for (dirpath, dirnames, filenames) in os.walk('modules/catalyst/arch'):
                for _fn in filenames:
                        if not _fn.endswith('.py'):
                                continue