Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from J. Ali Harlow to avoid generating gtk.immodules when

Browse Source 
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)
This commit is contained in:
Owen Taylor
2002-09-27 22:10:55 +00:00
committed by Owen Taylor
parent 743a039cd1
commit 27180abb70
7 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
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)
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
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)
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c

6
ChangeLog.pre-2-2
View File

@@ -1,3 +1,9 @@
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)
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c

6
ChangeLog.pre-2-4
View File

@@ -1,3 +1,9 @@
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)
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,9 @@
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)
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,9 @@
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)
Fri Sep 27 14:30:34 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/Makefile.am gdk/gdkkeynames.c gdk/linux-fb/gdkmain-fb.c

24
modules/input/Makefile.am
View File

@@ -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