From 247c61295ca7da60120a291b259ac7815b9ae718 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 24 Aug 2022 06:15:36 -0600 Subject: [PATCH] Install new config file man pages Signed-off-by: Jonathon Anderson --- Makefile | 7 +++++-- warewulf.spec.in | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 60ec87c6..c57250ba 100644 --- a/Makefile +++ b/Makefile @@ -164,6 +164,7 @@ files: all install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/ipxe install -d -m 0755 $(DESTDIR)$(BASHCOMPDIR) install -d -m 0755 $(DESTDIR)$(MANDIR)/man1 + install -d -m 0755 $(DESTDIR)$(MANDIR)/man5 install -d -m 0755 $(DESTDIR)$(WWDOCDIR) install -d -m 0755 $(DESTDIR)$(FIREWALLDDIR) install -d -m 0755 $(DESTDIR)$(SYSTEMDDIR) @@ -190,7 +191,8 @@ files: all install -m 0644 include/systemd/warewulfd.service $(DESTDIR)$(SYSTEMDDIR) install -m 0644 LICENSE.md $(DESTDIR)$(WWDOCDIR) cp bash_completion.d/warewulf $(DESTDIR)$(BASHCOMPDIR) - cp man_pages/* $(DESTDIR)$(MANDIR)/man1/ + cp man_pages/*.1* $(DESTDIR)$(MANDIR)/man1/ + cp man_pages/*.5* $(DESTDIR)$(MANDIR)/man5/ install -m 0644 staticfiles/arm64.efi $(DESTDIR)$(WWDATADIR)/ipxe install -m 0644 staticfiles/x86_64.efi $(DESTDIR)$(WWDATADIR)/ipxe install -m 0644 staticfiles/x86_64.kpxe $(DESTDIR)$(WWDATADIR)/ipxe @@ -227,7 +229,8 @@ man_page: man_pages: man_page install -d man_pages ./man_page ./man_pages - cd man_pages; for i in wwctl*1; do echo "Compressing manpage: $$i"; gzip --force $$i; done + cp docs/man/man5/*.5 ./man_pages/ + cd man_pages; for i in wwctl*1 *.5; do echo "Compressing manpage: $$i"; gzip --force $$i; done config_defaults: vendor cmd/config_defaults/config_defaults.go cd cmd/config_defaults && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf'\ diff --git a/warewulf.spec.in b/warewulf.spec.in index 67d9261f..08ba6c50 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -122,6 +122,7 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml %attr(-, root, root) %{_unitdir}/warewulfd.service %attr(-, root, root) %{_mandir}/man1/wwctl* +%attr(-, root, root) %{_mandir}/man5/*.5* %attr(-, root, root) %{_datadir}/warewulf %dir %{_docdir}/warewulf