summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@jamesh.id.au>2006-03-09 16:34:41 +0000
committerJames Henstridge <jamesh@src.gnome.org>2006-03-09 16:34:41 +0000
commit60172f93467d4fb5c7c928e97ef1a83ec4f2cd11 (patch)
tree1ab03870f19035b1f063a8c4367a6add4fa94133
parent64abedab59a3c6e2f5e2662fe1c8d9f9f4084568 (diff)
downloadgnome-common-60172f93467d4fb5c7c928e97ef1a83ec4f2cd11.tar.gz
skip directories called "_darcs", similar to the handling of other VCS
2006-03-10 James Henstridge <james@jamesh.id.au> * macros2/gnome-autogen.sh (configure_files): skip directories called "_darcs", similar to the handling of other VCS metadata dirs. Fixes bug #321860. svn path=/trunk/; revision=3775
-rw-r--r--ChangeLog6
-rw-r--r--macros2/gnome-autogen.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 679105d..65a5463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-10 James Henstridge <james@jamesh.id.au>
+
+ * macros2/gnome-autogen.sh (configure_files): skip directories
+ called "_darcs", similar to the handling of other VCS metadata
+ dirs. Fixes bug #321860.
+
2005-10-24 James Henstridge <james@jamesh.id.au>
* macros2/gnome-autogen.sh (configure_files): update find
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 14c66c8..297fcfc 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -240,7 +240,7 @@ want_pkg_config=false
want_gtk_doc=false
want_gnome_doc_utils=false
-configure_files="`find $srcdir -name '{arch}' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`"
+configure_files="`find $srcdir -name '{arch}' -prune -o '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`"
for configure_ac in $configure_files; do
if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
grep "^LT_INIT" $configure_ac >/dev/null; then