diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2013-12-30 22:24:45 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2013-12-30 22:24:45 +0000 |
| commit | 150b789f3251eef3d123d2679de50c9ab79f626b (patch) | |
| tree | dcb9c7cd78bb1383f5496f95183e43ba5de45b75 /emulators/qemu-devel/files/patch-Makefile | |
| parent | Update to version 20131230. (diff) | |
- Update to 1.7.0, announce message is here:
http://lists.nongnu.org/archive/html/qemu-devel/2013-12/msg01770.html
- Bring back BSD_USER knob thanx to sson's latest patches. [1]
Submitted by: sson [1]
Notes
Notes:
svn path=/head/; revision=338187
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 87a365001ffc..3eba14264cf3 100644 --- a/emulators/qemu-devel/files/patch-Makefile +++ b/emulators/qemu-devel/files/patch-Makefile @@ -1,28 +1,28 @@ Index: qemu/Makefile -@@ -53,7 +53,11 @@ LIBS+=-lz $(LIBS_TOOLS) +@@ -65,7 +65,11 @@ LIBS+=-lz $(LIBS_TOOLS) HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS +ifdef NOPORTDOCS +DOCS=qemu.1 qemu-img.1 qemu-nbd.8 +else - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt + DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt +endif ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif -@@ -311,8 +315,10 @@ endif +@@ -304,8 +308,10 @@ endif install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" +ifndef NOPORTDOCS $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) QMP/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" +endif ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" -@@ -331,7 +337,10 @@ install-confdir: + $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" +@@ -334,7 +340,10 @@ install-confdir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)" install-sysconfig: install-datadir install-confdir @@ -32,5 +32,5 @@ Index: qemu/Makefile + $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(qemu_confdir)"; \ + fi - install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig install-datadir - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" + install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ + install-datadir install-localstatedir |