[Update CVS with a previously un-synchronized change.]

git-svn-id: http://scons.tigris.org/svn/scons/trunk@729 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/config b/config
index 0769a2bc7fe8d7be984668c32b1537951aa07efa..3dd4a782a3907e8567c73ab99306cd5646dbdc81 100644 (file)
--- a/config
+++ b/config
@@ -56,9 +56,10 @@ build_command = "python ${Source bootstrap.py} -Y${SUBSTitute : \\ -Y $Search_Pa
  * SCons removes its targets before constructing them, which qualifies it
  * for the following entry in the config file.  The files must be removed
  * first, otherwise the baseline would cease to be self-consistent.
-link_integration_directory = true;
  */
 
+link_integration_directory = true;
+
 /*
  * This is set temporarily to allow us to build using the SCons
  * currently checked in to the src directory.
@@ -233,9 +234,16 @@ merge -p -L baseline -L C$c ${quote $mostrecent} ${quote $original} \
 ${quote $input} > ${quote $output}; \
 test $? -le 1";
 
+/*
+ * The diff command in Red Hat 8.0 changed the exit status so it *fails*
+ * when *it* thinks it's trying to diff a binary (non-ASCII-text) file.
+ * The -a option disables this behavior and makes diff's exit status
+ * behave like it used to, even on any binary files we have checked in.
+ */
+
 diff_command =
        "set +e; \
-       diff -c ${quote $original} ${quote $input} > ${quote $output}; \
+       diff -a -c ${quote $original} ${quote $input} > ${quote $output}; \
        test $? -le 1";
 
 /*