diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-18 19:23:06 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-18 19:23:06 -0400 |
| commit | c51f96578226ee106a59d52bf1920f50adb16ae1 (patch) | |
| tree | f83fb6bc152b56f4448aa46a89aa1e5c5a194dfe /modules/input | |
| parent | fac142c25a3a3794364110961c2d60ab3a5749c5 (diff) | |
| download | gtk+-c51f96578226ee106a59d52bf1920f50adb16ae1.tar.gz | |
Some cleanups after the module cache file change
Bring the various 'run uninstalled' hacks in line with the
new way of doing things, and fix make install for module cache
files.
Patch by Tadej Borovsak.
Diffstat (limited to 'modules/input')
| -rw-r--r-- | modules/input/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 5c58211e86..01248fed04 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -189,13 +189,13 @@ endif # after the libraries are installed in their final locations. install-data-hook: @if $(RUN_QUERY_IMMODULES_TEST) ; then \ - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \ - echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules" ; \ - $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules ; \ + 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" ; \ + $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \ else \ echo "***" ; \ - echo "*** Warning: gtk.immodules not built" ; \ + echo "*** Warning: immodules.cache not built" ; \ echo "***" ; \ echo "*** Generate this file manually on host" ; \ echo "*** system using gtk-query-immodules-3.0" ; \ @@ -203,7 +203,7 @@ install-data-hook: fi uninstall-local: - rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules + rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache if BUILD_DYNAMIC_MODULES @@ -239,14 +239,14 @@ noinst_LTLIBRARIES = \ included-modules: $(noinst_LTLIBRARIES) -gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > gtk.immodules +immodules.cache: Makefile.am $(module_LTLIBRARIES) + $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache -CLEANFILES = gtk.immodules +CLEANFILES = immodules.cache if CROSS_COMPILING else -all-local: gtk.immodules +all-local: immodules.cache endif -include $(top_srcdir)/git.mk |