summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-08-30 18:23:43 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-08-30 18:23:43 +0000
commite989c70674b0d62dccd070b3740a5dc7fa39eaae (patch)
tree803d0dbce8df2299eea75522fc97905f22e34ce6
parent597e6d8e9755a237f77711be68dfc2139aac290e (diff)
downloadpango-e989c70674b0d62dccd070b3740a5dc7fa39eaae.tar.gz
Improve the conditional to ignore included modules.
2006-08-30 Behdad Esfahbod <behdad@gnome.org> * modules/Makefile.am (pango.modules): Improve the conditional to ignore included modules.
-rw-r--r--ChangeLog5
-rw-r--r--modules/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 288a9133..7774e13d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-08-30 Behdad Esfahbod <behdad@gnome.org>
+ * modules/Makefile.am (pango.modules): Improve the conditional to
+ ignore included modules.
+
+2006-08-30 Behdad Esfahbod <behdad@gnome.org>
+
Bug 352811 – SIGSEGV with pango(cairo)-view on HP-UX
* modules/Makefile.am (pango.modules): Don't hardcode .so extension.
diff --git a/modules/Makefile.am b/modules/Makefile.am
index efc1532a..43c5410e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -47,7 +47,7 @@ uninstall-local:
$(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
pango.modules: $(top_builddir)/pango/pango-querymodules $(SUBDIRS)
- @if find . -name '*.la' | grep '.' > /dev/null ; then \
+ @if 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 `find . -name '*.la' | grep -v '\.libs' | grep -v libpango` > $@ ;\
else \