[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-diffutils] [PATCH 02/19] sdiff, diff3: exec diff, not $(bindir)/dif
From: |
Jim Meyering |
Subject: |
[bug-diffutils] [PATCH 02/19] sdiff, diff3: exec diff, not $(bindir)/diff |
Date: |
Fri, 20 Nov 2009 10:12:11 +0100 |
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
- [bug-diffutils] [PATCH 01/19] tests: add the first script; hook up gnulib-tests, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 06/19] build: avoid link failure when libsigsegv is used, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 05/19] maint: define/use PROGRAM_NAME and AUTHORS; use propername module, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 14/19] build: enable many warnings, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 02/19] sdiff, diff3: exec diff, not $(bindir)/diff,
Jim Meyering <=
- [bug-diffutils] [PATCH 19/19] maint: remove hard-coded macro definitions provided by intprops.h, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 04/19] maint: no longer define *_FILENO constants, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 12/19] build: update gnulib submodule to latest, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 17/19] build: suppress warnings about bindtextdomain and textdomain, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 15/19] use xfreopen rather than freopen, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 10/19] build: let automake generate better man-installation rules, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 11/19] maint: hide build commands behind $(AM_V_GEN), Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 18/19] maint: add gnulib's announce-gen module, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 16/19] build: use more gnulib modules, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 13/19] build: "make stable" emitted an invalid gnupload command, Jim Meyering, 2009/11/20