diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-05-31 16:35:31 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-05-31 16:35:31 +0000 |
| commit | f27d6c31c1a933f9b27dc21e95314ecf05786416 (patch) | |
| tree | c2e49fd1ac7d34c45845682d40493f1fbc6b40de /modules/Makefile.am | |
| parent | 8af46dd0b025d7c9838db2cc833f5cef504a9e24 (diff) | |
| download | pango-f27d6c31c1a933f9b27dc21e95314ecf05786416.tar.gz | |
Actually advance through list. (Problem noticed by Erwann Chenede)
Thu May 31 12:31:20 2001 Owen Taylor <otaylor@redhat.com>
* pango/pangox-fontmap.c (pango_x_font_map_for_display):
Actually advance through list. (Problem noticed
by Erwann Chenede)
* modules/Makefile.am (install-data-local): Move rule
for generation of /etc/pango/pango.modules to here,
since we are now built _after_ the library. (Problem
noticed by KUSANO Takayuki)
Diffstat (limited to 'modules/Makefile.am')
| -rw-r--r-- | modules/Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index 999912f7..4f7f259d 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -12,6 +12,17 @@ SUBDIRS = \ EXTRA_DIST = \ module.def +install-data-local: + ($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango; \ + if ls $(DESTDIR)$(libdir)/pango/modules/*.so | grep 'so' > /dev/null ; then \ + echo "Wrote $(DESTDIR)$(sysconfdir)/pango/pango.modules."; \ + $(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so \ + > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \ + else \ + echo "No dynamic modules were installed; all modules were linked statically."; \ + echo "# This is an empty file, because Pango was installed with no dynamic modules" > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \ + fi) + included-modules: @for d in $(SUBDIRS) ; do \ ( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \ |