diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-09-27 22:10:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-09-27 22:10:55 +0000 |
| commit | 27180abb70dbd85d59d1ee146c787191e29625cd (patch) | |
| tree | 023f335205b821de9f66df7cbaaa9ab648890116 /modules/input | |
| parent | 743a039cd14ca7e94f2211aa516112890444a3eb (diff) | |
| download | gdk-pixbuf-27180abb70dbd85d59d1ee146c787191e29625cd.tar.gz | |
Patch from J. Ali Harlow to avoid generating gtk.immodules when
Fri Sep 27 17:40:47 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/Makefile.am: Patch from J. Ali Harlow
to avoid generating gtk.immodules when cross-compiling.
(#87774)
Diffstat (limited to 'modules/input')
| -rw-r--r-- | modules/input/Makefile.am | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index bbe5bbd17..5d8aac795 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 |