summaryrefslogtreecommitdiff
path: root/gtk/Makefile.am
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-11-16 21:17:53 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-11-16 21:17:53 +0000
commitb29a24d02833feb8486ab7045b62559ab7dd0208 (patch)
tree8c3692a78c4b7460994717752341fcba351ec33b /gtk/Makefile.am
parenta8b012d0a09149fcbf79bf6bc040b8e7f238e39a (diff)
downloadgtk+-b29a24d02833feb8486ab7045b62559ab7dd0208.tar.gz
Do not, in any circumstances, distribute gtk.immodules.
Thu Nov 16 16:11:39 2000 Owen Taylor <otaylor@redhat.com> * 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
Diffstat (limited to 'gtk/Makefile.am')
-rw-r--r--gtk/Makefile.am9
1 files changed, 4 insertions, 5 deletions
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:
+