diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-09-27 22:01:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-09-27 22:01:55 +0000 |
| commit | a031b12aacf2a586447b39f25a8f0e6ae5944c4d (patch) | |
| tree | 224cab44744244746ed8579c7fddbb34bddc0c59 /modules/Makefile.am | |
| parent | ac5a399de9c2bb3ecd3244f82ee614240e164f5f (diff) | |
| download | pango-a031b12aacf2a586447b39f25a8f0e6ae5944c4d.tar.gz | |
(Based on GTK+ patch by J. Ali Harlow in #87774)
Fri Sep 27 17:50:51 2002 Owen Taylor <otaylor@redhat.com>
(Based on GTK+ patch by J. Ali Harlow in #87774)
* configure.in: Add CROSS_COMPILING conditional.
* modules/Makefile.am (install-data-local): Don't
generate pango.modules when installing into a DESTDIR
or cross-compiling.
* examples/Makefile.am (all-local): Don't generate
pango.modules when cross-compiling.
Diffstat (limited to 'modules/Makefile.am')
| -rw-r--r-- | modules/Makefile.am | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index ea29cb97..d95dc284 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -12,10 +12,28 @@ SUBDIRS = \ EXTRA_DIST = \ module.def +if CROSS_COMPILING +RUN_QUERY_IMMODULES_TEST=false +else +RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)" +endif + install-data-local: - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ - $(top_builddir)/pango/pango-querymodules \ - > $(DESTDIR)$(sysconfdir)/pango/pango.modules + @if $(RUN_QUERY_IMMODULES_TEST) ; then \ + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ + $(top_builddir)/pango/pango-querymodules \ + \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ + $(top_builddir)/pango/pango-querymodules \ + > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ + else \ + echo "***" ; \ + echo "*** Warning: pango.modules not created" ; \ + echo "***" ; \ + echo "*** Generate this file on the target system" ; \ + echo "*** system using pango-querymodules" ; \ + echo "***" ; \ + fi included-modules: @for d in $(SUBDIRS) ; do \ |