diff --git a/Makefile b/Makefile index 4c641d41..e2f4ab3f 100644 --- a/Makefile +++ b/Makefile @@ -27,16 +27,16 @@ CFLAGS ?= -O2 -g -Wall -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format bashcompletiondir ?= ${datadir}/bash-completion/completions pkgconfigdatadir ?= $(datadir)/pkgconfig -man1pages = lsinitrd.1 +man1pages = man/lsinitrd.1 -man5pages = dracut.conf.5 +man5pages = man/dracut.conf.5 -man7pages = dracut.cmdline.7 \ - dracut.bootup.7 \ - dracut.modules.7 +man7pages = man/dracut.cmdline.7 \ + man/dracut.bootup.7 \ + man/dracut.modules.7 -man8pages = dracut.8 \ - dracut-catimages.8 \ +man8pages = man/dracut.8 \ + man/dracut-catimages.8 \ modules.d/98dracut-systemd/dracut-cmdline.service.8 \ modules.d/98dracut-systemd/dracut-initqueue.service.8 \ modules.d/98dracut-systemd/dracut-mount.service.8 \ @@ -115,14 +115,15 @@ endif @rm -f -- "$@" asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $< -dracut.8: dracut.usage.asc dracut.8.asc +dracut.8: man/dracut.8.asc \ + man/dracut.usage.asc -dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc +dracut.html: man/dracut.asc $(manpages) dracut.css man/dracut.usage.asc @rm -f -- dracut.xml asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \ -a "version=$(DRACUT_FULL_VERSION)" \ -a numbered \ - -d book -b docbook -o dracut.xml dracut.asc + -d book -b docbook -o dracut.xml man/dracut.asc @rm -f -- dracut.html xsltproc -o dracut.html --xinclude -nonet \ --stringparam custom.css.source dracut.css \ diff --git a/dracut-catimages.8.asc b/man/dracut-catimages.8.asc similarity index 100% rename from dracut-catimages.8.asc rename to man/dracut-catimages.8.asc diff --git a/dracut.8.asc b/man/dracut.8.asc similarity index 100% rename from dracut.8.asc rename to man/dracut.8.asc diff --git a/dracut.asc b/man/dracut.asc similarity index 100% rename from dracut.asc rename to man/dracut.asc diff --git a/dracut.bootup.7.asc b/man/dracut.bootup.7.asc similarity index 100% rename from dracut.bootup.7.asc rename to man/dracut.bootup.7.asc diff --git a/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc similarity index 100% rename from dracut.cmdline.7.asc rename to man/dracut.cmdline.7.asc diff --git a/dracut.conf.5.asc b/man/dracut.conf.5.asc similarity index 100% rename from dracut.conf.5.asc rename to man/dracut.conf.5.asc diff --git a/dracut.modules.7.asc b/man/dracut.modules.7.asc similarity index 100% rename from dracut.modules.7.asc rename to man/dracut.modules.7.asc diff --git a/dracut.usage.asc b/man/dracut.usage.asc similarity index 100% rename from dracut.usage.asc rename to man/dracut.usage.asc diff --git a/lsinitrd.1.asc b/man/lsinitrd.1.asc similarity index 100% rename from lsinitrd.1.asc rename to man/lsinitrd.1.asc