aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-04-17 01:25:28 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-04-17 01:25:28 +0800
commit862bee6f1256c143732f3447210c746fb7a6b1da (patch)
tree03c518cdec7dc815eb6603c19cd9a5604226615c
parentb8d84cb373d6d20ce4577ab48b98c06af4555159 (diff)
downloadgsoc2013-evolution-862bee6f1256c143732f3447210c746fb7a6b1da.tar.gz
gsoc2013-evolution-862bee6f1256c143732f3447210c746fb7a6b1da.tar.zst
gsoc2013-evolution-862bee6f1256c143732f3447210c746fb7a6b1da.zip
Merge fix from the 0.10 branch:
`AC_OUTPUT()' `mail/Makefile' before `mail/importers/Makefile'. svn path=/trunk/; revision=9386
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cf098da8e..f2e4dcaf71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2001-04-16 Ettore Perazzoli <ettore@ximian.com>
+ * configure.in: `mail/importers/Makefile' must come after
+ `mail/Makefile'.
+
+2001-04-16 Ettore Perazzoli <ettore@ximian.com>
+
* Makefile.am (SUBDIRS): Add `doc'.
* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.
diff --git a/configure.in b/configure.in
index ae6910c3aa..5c524a5016 100644
--- a/configure.in
+++ b/configure.in
@@ -768,8 +768,8 @@ addressbook/gui/component/select-names/Makefile
shell/Makefile
shell/glade/Makefile
shell/importer/Makefile
-mail/importers/Makefile
mail/Makefile
+mail/importers/Makefile
data/Makefile
libversit/Makefile
libibex/Makefile