Bug 377185 – Hide cmp output in autogen.sh

2007-01-29  Mariano Suárez-Alvarez  <mariano@gnome.org>

	Bug 377185 – Hide cmp output in autogen.sh

	* macros2/gnome-autogen.sh: Do not show cmp's output.

svn path=/trunk/; revision=3901

diff --git a/ChangeLog b/ChangeLog
index a1ae96f..6c513e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-29  Mariano Suárez-Alvarez  <mariano@gnome.org>
+
+       Bug 377185 – Hide cmp output in autogen.sh
+
+       * macros2/gnome-autogen.sh: Do not show cmp's output.
+
 2007-01-29  Christian Persch  <chpe@svn.gnome.org>
 
        * macros2/gnome-compiler-flags.m4:

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index d0fa4c1..b5080f6 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -459,16 +459,25 @@ 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 [ -f COPYING ]; then
+          cp -pf COPYING COPYING.autogen_bak
+        fi
+        if [ -f INSTALL ]; then
+          cp -pf INSTALL INSTALL.autogen_bak
+        fi
        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
+        if [ -f COPYING.autogen_bak ]; then
+          cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING
+          rm -f COPYING.autogen_bak
+        fi
+        if [ -f INSTALL.autogen_bak ]; then
+          cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL
+          rm -f INSTALL.autogen_bak
+        fi
 
        cd "$topdir"
     fi