diff options
| author | Mariano Suárez-Alvarez <mariano@gnome.org> | 2007-01-29 22:11:28 +0000 |
|---|---|---|
| committer | Mariano Suárez-Alvarez <mariano@src.gnome.org> | 2007-01-29 22:11:28 +0000 |
| commit | ec595c4f0738e93d029e9b8fdc8a8089ecdcf5ff (patch) | |
| tree | 68dd3a337d8e2b397fefa75455e8bd7708a04445 | |
| parent | cfddda64894c4033a5924fdafde7706a89699191 (diff) | |
| download | shared-mime-info-ec595c4f0738e93d029e9b8fdc8a8089ecdcf5ff.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 19 |
2 files changed, 20 insertions, 5 deletions
@@ -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 d0fa4c13..b5080f69 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 |