From ec595c4f0738e93d029e9b8fdc8a8089ecdcf5ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mariano=20Su=C3=A1rez-Alvarez?= Date: Mon, 29 Jan 2007 22:11:28 +0000 Subject: [PATCH] =?utf8?q?Bug=20377185=20=E2=80=93=20Hide=20cmp=20output?= =?utf8?q?=20in=20autogen.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-01-29 Mariano Suárez-Alvarez Bug 377185 – Hide cmp output in autogen.sh * macros2/gnome-autogen.sh: Do not show cmp's output. svn path=/trunk/; revision=3901 --- ChangeLog | 6 ++++++ macros2/gnome-autogen.sh | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1ae96f..6c513e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-29 Mariano Suárez-Alvarez + + Bug 377185 – Hide cmp output in autogen.sh + + * macros2/gnome-autogen.sh: Do not show cmp's output. + 2007-01-29 Christian Persch * macros2/gnome-compiler-flags.m4: diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index d0fa4c1..b5080f6 100644 --- 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 -- 2.7.4