diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-05-08 01:51:05 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-05-08 01:51:05 +0000 |
| commit | 9c24a7a23e09dcd9e4625ad9b42a0de80a43e37a (patch) | |
| tree | 0f7486e2b2a3a782ab7d61d8ab09f7a2024fa81b | |
| parent | ef570b9272342323bfeb38d6df9e517e320313eb (diff) | |
| download | pango-9c24a7a23e09dcd9e4625ad9b42a0de80a43e37a.tar.gz | |
Bug 436154 – Error building the pango.modules file while cross compiling
2007-05-07 Behdad Esfahbod <behdad@gnome.org>
Bug 436154 – Error building the pango.modules file while cross
compiling
* modules/Makefile.am: Make local pango.module generation work with
cross-compilation.
svn path=/trunk/; revision=2265
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules/Makefile.am | 15 |
2 files changed, 17 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2007-05-07 Behdad Esfahbod <behdad@gnome.org> + + Bug 436154 – Error building the pango.modules file while cross + compiling + + * modules/Makefile.am: Make local pango.module generation work with + cross-compilation. + 2007-05-05 Richard Hult <richard@imendio.com> Bug 434160 - [atsui] Italic versions of some faces can't be created diff --git a/modules/Makefile.am b/modules/Makefile.am index 4813111e..7b6fcbd6 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -22,17 +22,17 @@ CLEANFILES = \ if CROSS_COMPILING RUN_QUERY_MODULES_TEST=false else -RUN_QUERY_MODULES_TEST=test -z "$(DESTDIR)" +RUN_QUERY_MODULES_TEST=true all-local: pango.modules endif install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) - @if $(RUN_QUERY_MODULES_TEST) ; then \ + @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ + $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ + $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ else \ echo "***" ; \ @@ -50,11 +50,14 @@ pango.modules: \ $(SUBDIRS) \ $(top_builddir)/config.status \ $(top_builddir)/pango/pango-querymodules$(EXEEXT) - @if find . -name '*.la' | grep -v '\.libs' | grep -v libpango | grep '.' > /dev/null ; then \ + @if $(RUN_QUERY_MODULES_TEST) && find . -name '*.la' | grep -v '\.libs' | grep -v libpango | grep '.' > /dev/null ; then \ echo "Writing a pango.modules file to use with tests/examples."; \ $(top_builddir)/pango/pango-querymodules$(EXEEXT) `find . -name '*.la' | grep -v '\.libs' | grep -v libpango` > $@ ;\ else \ - echo "No dynamic modules found; will use only static modules for tests/examples."; \ + echo "***" ; \ + echo "*** No dynamic modules found, or cross-compiling" ; \ + echo "*** Will use only static modules for tests and examples." ; \ + echo "***" ; \ > $@; \ fi |