summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--pango/Makefile.am6
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 99c8d31d..9599ba0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * pango/Makefile.am: Look for pango.def, pangoft2.def and
+ pangowin32.def files in the source directory. Fixes #311971.
+
2005-07-26 Manish Singh <yosh@gimp.org>
* pango/pango-utils.c (pango_is_zero_width): put parens around bitwise
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 99c8d31d..9599ba0c 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2005-07-29 J. Ali Harlow <ali@juiblex.co.uk>
+
+ * pango/Makefile.am: Look for pango.def, pangoft2.def and
+ pangowin32.def files in the source directory. Fixes #311971.
+
2005-07-26 Manish Singh <yosh@gimp.org>
* pango/pango-utils.c (pango_is_zero_width): put parens around bitwise
diff --git a/pango/Makefile.am b/pango/Makefile.am
index b4c59c2f..da1734a8 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -274,11 +274,11 @@ pangowin32-win32-res.o: pangowin32.rc
if OS_WIN32
install-def-files:
- $(INSTALL) pango.def $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).def
+ $(INSTALL) $(srcdir)/pango.def $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).def
if HAVE_FREETYPE
- $(INSTALL) pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
+ $(INSTALL) $(srcdir)/pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
endif
- $(INSTALL) pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
+ $(INSTALL) $(srcdir)/pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
uninstall-def-files:
-rm $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def
if HAVE_FREETYPE