From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 28 Jun 2003 05:13:23 +0000 (+0000)
Subject: [Update CVS with a previously un-synchronized change.]
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f15b0dc1d8dbd14da2cd9d6168cb23a6cd0d7ee;p=scons.git

[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 0769a2bc..3dd4a782 100644
--- 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";
 
 /*