From 626aecb4724fe5adc65f755d142804306fadb307 Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Mon, 20 Jun 2022 01:15:34 +0200 Subject: [PATCH] make: split out man page files into doc/man folder --- Makefile | 8 ++++---- doc/{ => man}/arch-nspawn.1.asciidoc | 2 +- doc/{ => man}/archbuild.1.asciidoc | 2 +- doc/{ => man}/checkpkg.1.asciidoc | 2 +- doc/{ => man}/devtools.7.asciidoc | 2 +- doc/{ => man}/diffpkg.1.asciidoc | 2 +- doc/{ => man}/export-pkgbuild-keys.1.asciidoc | 2 +- doc/{ => man}/find-libdeps.1.asciidoc | 2 +- doc/{ => man}/find-libprovides.1.asciidoc | 2 +- doc/{ => man/include}/footer.asciidoc | 0 doc/{ => man}/lddd.1.asciidoc | 2 +- doc/{ => man}/makechrootpkg.1.asciidoc | 2 +- doc/{ => man}/makerepropkg.1.asciidoc | 2 +- doc/{ => man}/mkarchroot.1.asciidoc | 2 +- doc/{ => man}/offload-build.1.asciidoc | 2 +- doc/{ => man}/sogrep.1.asciidoc | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) rename doc/{ => man}/arch-nspawn.1.asciidoc (95%) rename doc/{ => man}/archbuild.1.asciidoc (96%) rename doc/{ => man}/checkpkg.1.asciidoc (96%) rename doc/{ => man}/devtools.7.asciidoc (97%) rename doc/{ => man}/diffpkg.1.asciidoc (97%) rename doc/{ => man}/export-pkgbuild-keys.1.asciidoc (92%) rename doc/{ => man}/find-libdeps.1.asciidoc (90%) rename doc/{ => man}/find-libprovides.1.asciidoc (91%) rename doc/{ => man/include}/footer.asciidoc (100%) rename doc/{ => man}/lddd.1.asciidoc (92%) rename doc/{ => man}/makechrootpkg.1.asciidoc (97%) rename doc/{ => man}/makerepropkg.1.asciidoc (98%) rename doc/{ => man}/mkarchroot.1.asciidoc (96%) rename doc/{ => man}/offload-build.1.asciidoc (97%) rename doc/{ => man}/sogrep.1.asciidoc (97%) diff --git a/Makefile b/Makefile index 2194faa..c106db5 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(w MAKEPKG_CONFIGS=$(wildcard config/makepkg/*) PACMAN_CONFIGS=$(wildcard config/pacman/*) SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*) -MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(filter-out doc/footer.asciidoc,$(wildcard doc/*.asciidoc)))) +MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc))) COMMITPKG_LINKS = \ extrapkg \ @@ -83,10 +83,10 @@ endef $(eval $(call buildInScript,build/bin,src/,555)) $(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444))) -$(BUILDDIR)/doc/%: doc/%.asciidoc doc/asciidoc.conf doc/footer.asciidoc +$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/asciidoc.conf doc/man/include/footer.asciidoc $(GEN_MSG) - @mkdir -p $(BUILDDIR)/doc - @a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc -a pkgdatadir=$(PREFIX)/share/devtools $< + @mkdir -p $(BUILDDIR)/doc/man + @a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(PREFIX)/share/devtools $< clean: rm -rf $(BUILDDIR) diff --git a/doc/arch-nspawn.1.asciidoc b/doc/man/arch-nspawn.1.asciidoc similarity index 95% rename from doc/arch-nspawn.1.asciidoc rename to doc/man/arch-nspawn.1.asciidoc index 22aa641..a3e8ec1 100644 --- a/doc/arch-nspawn.1.asciidoc +++ b/doc/man/arch-nspawn.1.asciidoc @@ -37,4 +37,4 @@ Options *-h*:: Show this usage message -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/archbuild.1.asciidoc b/doc/man/archbuild.1.asciidoc similarity index 96% rename from doc/archbuild.1.asciidoc rename to doc/man/archbuild.1.asciidoc index 48a200d..6b00572 100644 --- a/doc/archbuild.1.asciidoc +++ b/doc/man/archbuild.1.asciidoc @@ -44,4 +44,4 @@ See Also linkman:devtools[7] -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/checkpkg.1.asciidoc b/doc/man/checkpkg.1.asciidoc similarity index 96% rename from doc/checkpkg.1.asciidoc rename to doc/man/checkpkg.1.asciidoc index d95f350..bd41416 100644 --- a/doc/checkpkg.1.asciidoc +++ b/doc/man/checkpkg.1.asciidoc @@ -40,4 +40,4 @@ See Also linkman:find-libprovides[1] -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/devtools.7.asciidoc b/doc/man/devtools.7.asciidoc similarity index 97% rename from doc/devtools.7.asciidoc rename to doc/man/devtools.7.asciidoc index a207439..82d0a77 100644 --- a/doc/devtools.7.asciidoc +++ b/doc/man/devtools.7.asciidoc @@ -52,4 +52,4 @@ linkman:offload-build[1] linkman:sogrep[1] Find packages using a linked to a given shared library -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/diffpkg.1.asciidoc b/doc/man/diffpkg.1.asciidoc similarity index 97% rename from doc/diffpkg.1.asciidoc rename to doc/man/diffpkg.1.asciidoc index 3fc0f00..48722a9 100644 --- a/doc/diffpkg.1.asciidoc +++ b/doc/man/diffpkg.1.asciidoc @@ -54,4 +54,4 @@ Modes See Also -------- -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/export-pkgbuild-keys.1.asciidoc b/doc/man/export-pkgbuild-keys.1.asciidoc similarity index 92% rename from doc/export-pkgbuild-keys.1.asciidoc rename to doc/man/export-pkgbuild-keys.1.asciidoc index 9c47515..d0141e4 100644 --- a/doc/export-pkgbuild-keys.1.asciidoc +++ b/doc/man/export-pkgbuild-keys.1.asciidoc @@ -22,4 +22,4 @@ Options *-h, --help*:: Show a help text. -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/find-libdeps.1.asciidoc b/doc/man/find-libdeps.1.asciidoc similarity index 90% rename from doc/find-libdeps.1.asciidoc rename to doc/man/find-libdeps.1.asciidoc index 17c77aa..79706b3 100644 --- a/doc/find-libdeps.1.asciidoc +++ b/doc/man/find-libdeps.1.asciidoc @@ -21,4 +21,4 @@ Options Ignore internal libraries. -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/find-libprovides.1.asciidoc b/doc/man/find-libprovides.1.asciidoc similarity index 91% rename from doc/find-libprovides.1.asciidoc rename to doc/man/find-libprovides.1.asciidoc index 9907b3a..e8e27d3 100644 --- a/doc/find-libprovides.1.asciidoc +++ b/doc/man/find-libprovides.1.asciidoc @@ -21,4 +21,4 @@ Options *--ignore-internal*:: Ignore internal libraries. -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/footer.asciidoc b/doc/man/include/footer.asciidoc similarity index 100% rename from doc/footer.asciidoc rename to doc/man/include/footer.asciidoc diff --git a/doc/lddd.1.asciidoc b/doc/man/lddd.1.asciidoc similarity index 92% rename from doc/lddd.1.asciidoc rename to doc/man/lddd.1.asciidoc index 3a015d2..c6bff26 100644 --- a/doc/lddd.1.asciidoc +++ b/doc/man/lddd.1.asciidoc @@ -22,4 +22,4 @@ See Also linkman:ldd[1] -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/makechrootpkg.1.asciidoc b/doc/man/makechrootpkg.1.asciidoc similarity index 97% rename from doc/makechrootpkg.1.asciidoc rename to doc/man/makechrootpkg.1.asciidoc index dee0518..12d32f1 100644 --- a/doc/makechrootpkg.1.asciidoc +++ b/doc/man/makechrootpkg.1.asciidoc @@ -73,4 +73,4 @@ Options *-U*:: Run makepkg as a specified user -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/makerepropkg.1.asciidoc b/doc/man/makerepropkg.1.asciidoc similarity index 98% rename from doc/makerepropkg.1.asciidoc rename to doc/man/makerepropkg.1.asciidoc index acf5069..4e694b3 100644 --- a/doc/makerepropkg.1.asciidoc +++ b/doc/man/makerepropkg.1.asciidoc @@ -56,4 +56,4 @@ Options *-h*:: Show this usage message -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/mkarchroot.1.asciidoc b/doc/man/mkarchroot.1.asciidoc similarity index 96% rename from doc/mkarchroot.1.asciidoc rename to doc/man/mkarchroot.1.asciidoc index eb0670a..7930c4c 100644 --- a/doc/mkarchroot.1.asciidoc +++ b/doc/man/mkarchroot.1.asciidoc @@ -46,4 +46,4 @@ See Also linkman:pacman[1] -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/offload-build.1.asciidoc b/doc/man/offload-build.1.asciidoc similarity index 97% rename from doc/offload-build.1.asciidoc rename to doc/man/offload-build.1.asciidoc index 5c9515f..6b39711 100644 --- a/doc/offload-build.1.asciidoc +++ b/doc/man/offload-build.1.asciidoc @@ -49,4 +49,4 @@ Example: To use a second `testing-x86_64-build` instance with another copydir: `offload-build -r testing -- -- -l ` -include::footer.asciidoc[] +include::include/footer.asciidoc[] diff --git a/doc/sogrep.1.asciidoc b/doc/man/sogrep.1.asciidoc similarity index 97% rename from doc/sogrep.1.asciidoc rename to doc/man/sogrep.1.asciidoc index 037773a..bae6da1 100644 --- a/doc/sogrep.1.asciidoc +++ b/doc/man/sogrep.1.asciidoc @@ -45,4 +45,4 @@ Environment Variables directory set by the **XDG_CACHE_HOME** environment variable or the **HOME** environment variable if **XDG_CACHE_HOME** is not set. -include::footer.asciidoc[] +include::include/footer.asciidoc[]