[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit caa5cd39e683c2bd78165c06b9433494b89891ba
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sat May 9 09:39:30 2009 +1000

    autogen.sh copies missing files
    
    darcs-hash:20090508233930-d4795-46230d538e3c5b4aba56944fc58f757070e0edf2.gz

diff --git a/Makefile.am b/Makefile.am
index 9796f3a..5c24a1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ endif
 ChangeLog: $(DARCS_CHANGELOG)
 
 changelog:
-	darcs changes > ChangeLog
+	darcs changes | grep -v Ignore-this: > ChangeLog
 
 debian-snapshot: $(DARCS_CHANGELOG) config.h src/version.h
 	sh debian/changelog.sh
diff --git a/autogen.sh b/autogen.sh
index 5b96c6f..a9b4e78 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -159,7 +159,7 @@ do
 	autoheader
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      automake --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )

-- 
Gerris Flow Solver