View | Details | Raw Unified | Return to bug 221749
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 47-53 Link Here
47 
OPTIONS_SUB=	yes
 47 
OPTIONS_SUB=	yes
48 
X11_USE=	SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2
 48 
X11_USE=	SDL=sdl XORG=x11,xext GNOME=gdkpixbuf2
49 
X11_CONFIGURE_ENABLE=	sdl
 49 
X11_CONFIGURE_ENABLE=	sdl
50 
GTK2_USE=	GNOME=gtk20,vte
 50 
GTK2_USE=	GNOME=gtk20,vte,gdkpixbuf2 XORG=x11,xext
51 
GTK2_USES=	gettext
 51 
GTK2_USES=	gettext
52 
GTK2_CONFIGURE_OFF=	--disable-gtk --disable-vte
 52 
GTK2_CONFIGURE_OFF=	--disable-gtk --disable-vte
53 
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 53 
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
(-)files/patch-Makefile (-2 / +14 lines)
Lines 1-11 Link Here
1 
--- Makefile.orig	2017-04-20 14:57:00 UTC
 1 
--- Makefile.orig	2017-04-20 14:57:00 UTC
2 
+++ Makefile
 2 
+++ Makefile
3 
@@ -206,9 +206,13 @@ LIBS+=-lz $(LIBS_TOOLS)
 3 
@@ -206,9 +206,14 @@ LIBS+=-lz $(LIBS_TOOLS)
4 
 HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
 4 
 HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
5
5
6 
 ifdef BUILD_DOCS
 6 
 ifdef BUILD_DOCS
7 
+ifdef NOPORTDOCS
 7 
+ifdef NOPORTDOCS
8 
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
 8 
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
9 
+DOCS+=docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7
9 
+else
 10 
+else
10 
 DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
 11 
 DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
11 
 DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7
 12 
 DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7
Lines 14-20 Link Here
14 
 ifdef CONFIG_VIRTFS
 15 
 ifdef CONFIG_VIRTFS
15 
 DOCS+=fsdev/virtfs-proxy-helper.1
 16 
 DOCS+=fsdev/virtfs-proxy-helper.1
16 
 endif
 17 
 endif
17 
@@ -558,11 +562,13 @@ BLOBS=
 18 
@@ -558,11 +563,13 @@ BLOBS=
18 
 endif
 19 
 endif
19
20
20 
 install-doc: $(DOCS)
 21 
 install-doc: $(DOCS)
Lines 28-30 Link Here
28 
 ifdef CONFIG_POSIX
 29 
 ifdef CONFIG_POSIX
29 
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
 30 
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
30 
 	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
 31 
 	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
32 
@@ -575,8 +582,10 @@ ifneq ($(TOOLS),)
33 
 endif
34 
 ifneq (,$(findstring qemu-ga,$(TOOLS)))
35 
 	$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"
36 
+ifndef NOPORTDOCS
37 
 	$(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"
38 
 	$(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"
39 
+endif
40 
 	$(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
41 
 endif
42 
 endif

Return to bug 221749