summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--modules/basic/Makefile.am2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d983073f..77bef9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-11 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/Makefile.am (INCLUDES): Remove an extraneous
+ / that was confusing gcc on Win32.
+
2005-01-10 Owen Taylor <otaylor@redhat.com>
* Makefile.am (EXTRA_DIST): Add missing ChangeLog.pre*
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d983073f..77bef9af 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2005-01-11 Owen Taylor <otaylor@redhat.com>
+
+ * modules/basic/Makefile.am (INCLUDES): Remove an extraneous
+ / that was confusing gcc on Win32.
+
2005-01-10 Owen Taylor <otaylor@redhat.com>
* Makefile.am (EXTRA_DIST): Add missing ChangeLog.pre*
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 50bef527..ad4580f1 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
+ -I$(top_srcdir)/pango \
$(GLIB_CFLAGS)
if PLATFORM_WIN32