]> Pileus Git - ~andy/gtk/commitdiff
Disable gtk-update-icon-cache.exe.manifest with --enable-gtk2-dependency
authorKalev Lember <kalev@smartlink.ee>
Fri, 29 Apr 2011 11:56:01 +0000 (14:56 +0300)
committerColin Walters <walters@verbum.org>
Fri, 29 Apr 2011 14:11:12 +0000 (10:11 -0400)
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

gtk/Makefile.am

index 0279dec662d468b1e98f2521fefa1a90c2e04401..5d9e5300ca4f30bd0500a412569c704f68d7fd0a 100644 (file)
@@ -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)