From: Kalev Lember <kalev@smartlink.ee>
Date: Fri, 29 Apr 2011 11:56:01 +0000 (+0300)
Subject: Disable gtk-update-icon-cache.exe.manifest with --enable-gtk2-dependency
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=bcc153e262ed1fae777aaeb05e3bb989d21a5a8e;p=~andy%2Fgtk

Disable gtk-update-icon-cache.exe.manifest with --enable-gtk2-dependency

When gtk-update-icon-cache building is suppressed, its manifest file
should also not be installed.

https://bugzilla.gnome.org/show_bug.cgi?id=648938
---

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0279dec66..5d9e5300c 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1024,7 +1024,6 @@ bin_PROGRAMS = \
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
-endif
 
 if OS_WIN32
 
@@ -1057,6 +1056,7 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST):
 	 echo '</assembly>' ) >$@
 
 endif
+endif
 
 gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_3_0_LDADD = $(LDADDS)