From e8dfddfa21a2d84db5693d195eca4b282745264c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 6 Dec 2019 13:48:47 +0000 Subject: [PATCH] docs: remove build recipes related to pod2man usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Cole Robinson Signed-off-by: Daniel P. Berrangé --- libvirt.spec.in | 1 - src/Makefile.am | 18 ------------------ tools/Makefile.am | 47 ----------------------------------------------- 3 files changed, 66 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 533cd87f86..249a4b5425 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -265,7 +265,6 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool %endif -BuildRequires: /usr/bin/pod2man %if 0%{?rhel} == 7 BuildRequires: python36-docutils %else diff --git a/src/Makefile.am b/src/Makefile.am index 239596624c..0267f16625 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,8 +54,6 @@ AM_LDFLAGS_MOD = \ $(AM_LDFLAGS) AM_LDFLAGS_MOD_NOUNDEF = $(AM_LDFLAGS_MOD) $(NO_UNDEFINED_LDFLAGS) -POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" - EXTRA_DIST = $(conf_DATA) BUILT_SOURCES = @@ -84,15 +82,11 @@ endif WITH_DTRACE_PROBES libexec_PROGRAMS = RPC_PROBE_FILES = LOGROTATE_FILES_IN = -PODFILES = -MANINFILES = SYSTEMD_UNIT_FILES = SYSTEMD_UNIT_FILES_IN = SYSCONF_FILES = sbin_PROGRAMS = -man8_MANS = DRIVER_SOURCES = -man7_MANS = COMMON_UNIT_VARS = \ -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ @@ -586,20 +580,8 @@ UNINSTALL_LOCAL += uninstall-logrotate endif WITH_LIBVIRTD -%.8: %.8.in $(top_srcdir)/configure.ac - $(AM_V_GEN)sed \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -CLEANFILES += \ - $(man8_MANS) \ - $(MANINFILES) - EXTRA_DIST += \ $(SYSTEMD_UNIT_FILES_IN) \ - $(PODFILES) \ $(NULL) diff --git a/tools/Makefile.am b/tools/Makefile.am index 53ac61fc7c..67b342d306 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -52,12 +52,6 @@ ICON_FILES = \ libvirt_win_icon_64x64.ico \ virsh_win_icon.rc -PODFILES = \ - $(NULL) - -MANINFILES = \ - $(NULL) - EXTRA_DIST = \ $(ICON_FILES) \ $(conf_DATA) \ @@ -69,7 +63,6 @@ EXTRA_DIST = \ virsh-edit.c \ bash-completion/vsh \ libvirt_recover_xattrs.sh \ - $(PODFILES) \ $(NULL) @@ -83,7 +76,6 @@ conf_DATA = bin_SCRIPTS = virt-xml-validate virt-pki-validate bin_PROGRAMS = virsh virt-admin libexec_SCRIPTS = libvirt-guests.sh -man1_MANS = if WITH_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup @@ -301,42 +293,6 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc --output-format coff --output $@ endif WITH_WIN_ICON -POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" - -%.1.in: %.pod - $(AM_V_GEN)$(POD2MAN) $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - -%.8.in: %.pod - $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - -%.1: %.1.in $(top_srcdir)/configure.ac - $(AM_V_GEN)sed \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -%.8: %.8.in $(top_srcdir)/configure.ac - $(AM_V_GEN)sed \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - install-data-local: install-systemd install-nss \ install-bash-completion @@ -574,8 +530,5 @@ clean-local: CLEANFILES += $(bin_SCRIPTS) CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s -CLEANFILES += $(man1_MANS) $(man8_MANS) DISTCLEANFILES += $(BUILT_SOURCES) - -MAINTAINERCLEANFILES += $(MANINFILES)