From b29a24d02833feb8486ab7045b62559ab7dd0208 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 16 Nov 2000 21:17:53 +0000 Subject: Do not, in any circumstances, distribute gtk.immodules. Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, distribute gtk.immodules. * gtk/Makefile.am (install-data-local): Don't install the gtk.immodules file created for the uninstalled modules; instead run gtk-query-immodules after install --- gtk/Makefile.am | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gtk/Makefile.am') diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 46580073b9..83eac00572 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -508,14 +508,12 @@ endif EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la -gtkconfdir = $(sysconfdir)/gtk-2.0 -gtkconf_DATA = gtk.immodules - # We create a dummy theme for the default GTK+ theme install-data-local: $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0 echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc - $(mkinstalldirs) $(DESTDIR)$(gtkconfdir) + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 + $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules uninstall-local: rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc @@ -623,6 +621,7 @@ EXTRA_DIST += @STRIP_BEGIN@ \ makefile.mingw.in \ makefile.msc \ makefile.msc.in \ - $(gtkconf_DATA) \ @STRIP_END@ +install-data-local: + -- cgit v1.2.1