[bug-diffutils] [PATCH 02/19] sdiff, diff3: exec diff, not $(bindir)/diff

[Jim Meyering]

From: Jim Meyering <address@hidden>

* src/Makefile.am (paths.h): Emit a definition of DEFAULT_DIFF_PROGRAM
that is simply "diff" (or whatever $(transform) would convert that to,
e.g., "gdiff").  This makes it so that tests can work without first
installing diff, and so that the binaries do not hard-code $(prefix).
* NEWS (Changes in behavior): Mention this.
---
 NEWS            |    5 +++++
 gnulib          |    2 +-
 src/Makefile.am |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a87f138..fc4996a 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,11 @@ GNU diffutils NEWS                                    -*- 
outline -*-

   sdiff now understands '1' and '2' as synonyms for 'l' and 'r'.

+** Changes in behavior
+
+  sdiff and diff3 now invoke diff, not $(bindir)/diff
+
+
 * Noteworthy changes in release 2.8.7 (2004-04-13) [stable]

   Version 2.8.7 contains no user-visible changes.
diff --git a/gnulib b/gnulib
index 492960c..6963723 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 492960c3a5eaaae32cd9d69d6fd5d7fdf96cbb78
+Subproject commit 69637233ce151566c1a861bce77e1ca32305638e
diff --git a/src/Makefile.am b/src/Makefile.am
index 99c011b..00f4f09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,6 @@ MOSTLYCLEANFILES = paths.h paths.ht

 cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
 paths.h:
-       (echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed 
'$(transform)'`'"' && \
+       (echo '#define DEFAULT_DIFF_PROGRAM "'`echo diff|sed '$(transform)'`'"' 
&& \
         echo '#define LOCALEDIR "$(localedir)"') >address@hidden
        mv address@hidden $@
-- 
1.6.5.3.433.g11067