diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2020-02-12 22:02:32 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2020-02-12 22:02:32 +0000 |
| commit | 9c244a58d9da09cdea1a8a5edddd7f69b3849034 (patch) | |
| tree | 581d2c6c1c5b2c97a66261e3c0a9171819e07e2b /emulators/qemu-devel/files/patch-Makefile | |
| parent | security/munge: Fix rc script (diff) | |
emulators/qemu-devel: Update version 4.1.0=>4.2.0
Reported by: lwhsu
Notes
Notes:
svn path=/head/; revision=525977
Diffstat (limited to 'emulators/qemu-devel/files/patch-Makefile')
| -rw-r--r-- | emulators/qemu-devel/files/patch-Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile index 095b684f8e80..e790dfd4efb7 100644 --- a/emulators/qemu-devel/files/patch-Makefile +++ b/emulators/qemu-devel/files/patch-Makefile @@ -1,22 +1,22 @@ ---- Makefile.orig 2019-04-23 18:14:45 UTC +--- Makefile.orig 2019-12-12 18:20:47 UTC +++ Makefile -@@ -311,9 +311,14 @@ LIBS+=-lz $(LIBS_TOOLS) - HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) +@@ -342,9 +342,14 @@ MANUAL_BUILDDIR := docs + endif ifdef BUILD_DOCS +ifdef NOPORTDOCS +DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 +DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 +else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 + DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 +endif DOCS+=docs/qemu-block-drivers.7 DOCS+=docs/qemu-cpu-models.7 ifdef CONFIG_VIRTFS -@@ -742,11 +747,13 @@ install-sphinxdocs: sphinxdocs - $(call install-manual,interop) +@@ -819,11 +824,13 @@ install-sphinxdocs: sphinxdocs + $(call install-manual,specs) install-doc: $(DOCS) install-sphinxdocs +ifndef NOPORTDOCS @@ -29,10 +29,10 @@ ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -764,8 +771,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP +@@ -841,8 +848,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP endif ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" + $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8" +ifndef NOPORTDOCS $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" |