summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@jamesh.id.au>2005-08-17 00:53:06 +0000
committerJames Henstridge <jamesh@src.gnome.org>2005-08-17 00:53:06 +0000
commit5016cc29238a7050d7c1b584e266d8cf1d3b19ab (patch)
treeaa87bdd1b9b95a2ecc58c1ca825beba2cbb7e6c1
parent710365e43f5e6402fc9aa1b6cbc01bee9582a124 (diff)
downloadgnome-common-5016cc29238a7050d7c1b584e266d8cf1d3b19ab.tar.gz
pass --force to gnome-doc-prepare to match other tools. Fixes bug #311775.
2005-08-17 James Henstridge <james@jamesh.id.au> * macros2/gnome-autogen.sh: pass --force to gnome-doc-prepare to match other tools. Fixes bug #311775. svn path=/trunk/; revision=3603
-rw-r--r--ChangeLog3
-rw-r--r--macros2/gnome-autogen.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1247848..246b506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-08-17 James Henstridge <james@jamesh.id.au>
+ * macros2/gnome-autogen.sh: pass --force to gnome-doc-prepare to
+ match other tools. Fixes bug #311775.
+
* macros2/gnome-autogen.sh: don't use syntax that non-GNU greps
don't understand. Fixes bug #313531.
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index f5be87c..420e6cf 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -383,7 +383,7 @@ for configure_ac in $configure_files; do
fi
if grep "^GNOME_DOC_INIT" $basename >/dev/null; then
printbold "Running $GNOME_DOC_PREPARE..."
- $GNOME_DOC_PREPARE --copy || exit 1
+ $GNOME_DOC_PREPARE --force --copy || exit 1
fi
# Now run aclocal to pull in any additional macros needed