From c28f9bbb582a679ede9198e89fa999b4bc962cd9 Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Fri, 11 Feb 2005 08:59:41 +0000
Subject: [PATCH] preserve COPYING and INSTALL files over the "automake
 --force" call. Fixes

2005-02-11  James Henstridge  <james@jamesh.id.au>

	* gnome-autogen.sh: preserve COPYING and INSTALL files over the
	"automake --force" call.  Fixes bug #161916.

svn path=/trunk/; revision=3488
---
 .cvsignore               | 18 +++++++-----------
 macros2/ChangeLog        |  5 +++++
 macros2/gnome-autogen.sh |  5 +++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d500526..cc3fdad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,18 +1,14 @@
+COPYING
+INSTALL
 Makefile.in
 Makefile
 aclocal.m4
 autom4te.cache
-config.guess
-config.h.in
-config.sub
-configure
-ltconfig
-ltmain.sh
-config.log
-config.h
 config.cache
-libtool
+config.log
 config.status
-stamp-h
-stamp.h
+configure
+install-sh
+missing
+mkinstalldirs
 gnome-common.spec
diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 5f34369..30a71d9 100644
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-11  James Henstridge  <james@jamesh.id.au>
+
+	* gnome-autogen.sh: preserve COPYING and INSTALL files over the
+	"automake --force" call.  Fixes bug #161916.
+
 2005-01-22  Rodney Dawes  <dobey@novell.com>
 
 	* gnome-autogen.sh: Fix the (AC|IT)_PROG_INTLTOOL support for
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index ca97e75..f43f4a9 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -388,11 +388,16 @@ for configure_ac in $configure_files; do
 
 	# Finally, run automake to create the makefiles ...
 	printbold "Running $AUTOMAKE..."
+        cp -pf COPYING COPYING.autogen_bak
+        cp -pf INSTALL INSTALL.autogen_bak
 	if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
 	    $AUTOMAKE --gnu --add-missing --force --copy || exit 1
 	else
 	    $AUTOMAKE --gnu --add-missing --copy || exit 1
 	fi
+        cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING
+        cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL
+        rm -f COPYING.autogen_bak INSTALL.autogen_bak
 
 	cd "$topdir"
     fi
-- 
2.7.4