diff --git a/ChangeLog b/ChangeLog index ecd87011a5..babbee2979 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 27 17:40:47 2002 Owen Taylor + + * modules/input/Makefile.am: Patch from J. Ali Harlow + to avoid generating gtk.immodules when cross-compiling. + (#87774) + Fri Sep 27 14:30:34 2002 Eric Warmenhoven * gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ecd87011a5..babbee2979 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Sep 27 17:40:47 2002 Owen Taylor + + * modules/input/Makefile.am: Patch from J. Ali Harlow + to avoid generating gtk.immodules when cross-compiling. + (#87774) + Fri Sep 27 14:30:34 2002 Eric Warmenhoven * gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ecd87011a5..babbee2979 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Sep 27 17:40:47 2002 Owen Taylor + + * modules/input/Makefile.am: Patch from J. Ali Harlow + to avoid generating gtk.immodules when cross-compiling. + (#87774) + Fri Sep 27 14:30:34 2002 Eric Warmenhoven * gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ecd87011a5..babbee2979 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Sep 27 17:40:47 2002 Owen Taylor + + * modules/input/Makefile.am: Patch from J. Ali Harlow + to avoid generating gtk.immodules when cross-compiling. + (#87774) + Fri Sep 27 14:30:34 2002 Eric Warmenhoven * gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ecd87011a5..babbee2979 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Sep 27 17:40:47 2002 Owen Taylor + + * modules/input/Makefile.am: Patch from J. Ali Harlow + to avoid generating gtk.immodules when cross-compiling. + (#87774) + Fri Sep 27 14:30:34 2002 Eric Warmenhoven * gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ecd87011a5..babbee2979 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Sep 27 17:40:47 2002 Owen Taylor + + * modules/input/Makefile.am: Patch from J. Ali Harlow + to avoid generating gtk.immodules when cross-compiling. + (#87774) + Fri Sep 27 14:30:34 2002 Eric Warmenhoven * gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index bbe5bbd176..5d8aac795b 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -74,12 +74,27 @@ im_hangul_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined im_hangul_la_SOURCES = imhangul.c imhangul-defs.h im_hangul_la_LIBADD = $(LDADDS) -# Running this if DESTDIR is set is going to not work at all, so -# skip it. +if CROSS_COMPILING +RUN_QUERY_IMMODULES_TEST=false +else +RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)" +endif + +# Running this if cross compiling or if DESTDIR is set is going to +# not work at all, so skip it. install-data-local: - if [ -z "$(DESTDIR)" ] ; then \ + @if $(RUN_QUERY_IMMODULES_TEST) ; then \ + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ + echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \ $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \ + else \ + echo "***" ; \ + echo "*** Warning: gtk.immodules not built" ; \ + echo "***" ; \ + echo "*** Generate this file manually on host" ; \ + echo "*** system using gtk-query-immodules-2.0" ; \ + echo "***" ; \ fi module_LTLIBRARIES = \ @@ -97,4 +112,7 @@ module_LTLIBRARIES = \ gtk.immodules: Makefile.am $(module_LTLIBRARIES) $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules +if CROSS_COMPILING +else all-local: gtk.immodules +endif