From f8c606533075e02f7712d5ac88fe5aa8185fe152 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 14 Sep 2012 17:35:31 +0100 Subject: [PATCH] Look in builddir for icons & strip build dir prefix from enum file includs --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8f9339c..91aa71e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,9 @@ BUILT_SOURCES = \ $(NULL) $(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES) - $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' > $@ + $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | \ + sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' \ + -e 's,$(srcdir)/,,' > $@ COMMON_SOURCES = \ $(BUILT_SOURCES) \ @@ -139,7 +141,7 @@ desktop_DATA = remote-viewer.desktop EXTRA_DIST += $(desktop_DATA) VIRT_VIEWER_RES = virt-viewer.rc virt-viewer.manifest -ICONDIR = $(top_srcdir)/icons +ICONDIR = $(top_builddir)/icons MANIFESTDIR = $(srcdir) EXTRA_DIST += $(VIRT_VIEWER_RES)