diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-01-03 21:31:55 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-01-03 21:35:23 -0500 |
| commit | a975d62071d71814eb9e6b3c379228f4cd66f0d3 (patch) | |
| tree | f4daface2716fb0e8f6daba15f3d4e3ce76cafc8 /modules | |
| parent | 7266d0f11fb25e27e51026fabe976de2c105a9eb (diff) | |
| download | gtk+-a975d62071d71814eb9e6b3c379228f4cd66f0d3.tar.gz | |
Rename gtk-update-icon-cache and gtk-builder-convert back
In bug 635207, it was pointed out that it is a bad idea to
rename these tools purely in the name of parallel-installability,
since it forces dependencies to make a choice between running
gtk-update-icon-cache and gtk-update-icon-cache-3.0 (or both ?!).
So, we rename these utilities back to their un-suffixed names
and rely on distributors to resolve the conflict between GTK+ 2.x
and GTK+ 3.0 packages, which can be done e.g. by dropping the
utilities from the gtk3 packages and add a gtk3 -> gtk2 dependency.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 72c2029f2b..eb078f98f4 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -184,7 +184,7 @@ endif # install-data-am, and not install-exec-am. We need to ensure this gets run # after the libraries are installed in their final locations. install-data-hook: - @if $(RUN_QUERY_IMMODULES_TEST) ; then \ + $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \ echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \ $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \ echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \ @@ -236,7 +236,7 @@ noinst_LTLIBRARIES = \ included-modules: $(noinst_LTLIBRARIES) immodules.cache: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache + $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache EXTRA_DIST += README.multipress |