summaryrefslogtreecommitdiff
path: root/modules/input
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-09-04 16:07:05 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-09-04 16:07:05 +0000
commitc9b26b3dc6eaf9f8314264cb1cfc763fcbf06243 (patch)
tree1a6ac7c231afdca19aecf3cb107f59900e235df3 /modules/input
parentf4ab7aa5eb7040e7fca8df335c5aac375f96e8f2 (diff)
downloadgtk+-c9b26b3dc6eaf9f8314264cb1cfc763fcbf06243.tar.gz
Version 1.3.7GTK_1_3_7
Tue Sep 4 09:37:19 2001 Owen Taylor <otaylor@redhat.com> * Version 1.3.7 * configure.in docs/Makefile.am docs/gtk-config.1.in: Remove docs for gtk-config * modules/input/Makefile.am (install-data-local): Don't run gtk-query-immodules if DESTDIR is set. * NEWS: Various additions.
Diffstat (limited to 'modules/input')
-rw-r--r--modules/input/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 06e3be983d..9d6cf304d2 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -54,10 +54,13 @@ im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
im_ipa_la_SOURCES = imipa.c
im_ipa_la_LIBADD = $(LDADDS)
-# We create a dummy theme for the default GTK+ theme
+# Running this if DESTDIR is set is going to not work at all, so
+# skip it.
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0
- $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ if [ -z "$(DESTDIR)" ] ; then \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+ fi
module_LTLIBRARIES = im-cyrillic-translit.la $(IM_XIM_MODULE) im-viqr.la im-thai-broken.la \
im-inuktitut.la im-ipa.la