add DIFF #define

diff --git a/ChangeLog b/ChangeLog
index f6fbd0a95c9382bc33dfcee91e76fd3960497c02..f5abce3cbbeb35e517ba64d7d34598e61b180c7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 21 12:23:40 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * include/dpkg.h.in: add DIFF #define
+  * main/configure.c: use it
+
 Sun Apr 14 16:13:16 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
   * man/en/deb-old.5.sgml: DocBook version of deb-old manpage
@@ -7,7 +12,7 @@ Sun Apr 14 16:13:16 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
 Sun Apr 14 00:49:09 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
-  * scripts/controlllib.pl: accept multilpe consectucive empty lines
+  * scripts/controlllib.pl: accept multilpe consecutive empty lines
 
 Sat Apr 13 22:59:25 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 

diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index 3ad1a3b06de8b566bbe020ed3ee8277b6285e1ae..826a0b2c837b2c9ffc1ccb403d6038a0b2b4591e 100644 (file)
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -129,6 +129,7 @@
 #define RM             "rm"
 #define FIND           "find"
 #define SHELL          "sh"
+#define DIFF           "diff"
 
 #define SHELLENVIR     "SHELL"
 

diff --git a/main/configure.c b/main/configure.c
index f41d85217b74275de05d9188c6e277d60b7b2dc7..bac402d9317d49b579db878768d2df2396b40e10 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -2,7 +2,8 @@
  * dpkg - main program for package management
  * configure.c - configure packages
  *
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright 1999 Wichert Akkerman <wichert@deephackmode.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -316,11 +317,11 @@ void deferred_configure(struct pkginfo *pkg) {
              char cmdbuf[1024];
              p= getenv(PAGERENV);
              if (!p || !*p) p= DEFAULTPAGER;
-             sprintf(cmdbuf, "diff -Nu %.250s %.250s | %.250s", cdr.buf, cdr2.buf, p);
+             sprintf(cmdbuf, DIFF " -Nu %.250s %.250s | %.250s", cdr.buf, cdr2.buf, p);
               s= getenv(SHELLENV);
               if (!s || !*s) s= DEFAULTSHELL;
              execlp(s,s,"-c", cmdbuf, NULL);
-              ohshite(_("failed to run diff (%.250s)"), cmdbuf);
+              ohshite(_("failed to run %s (%.250s)"), DIFF, cmdbuf);
            }
             while ((r= waitpid(c1,&status,0)) == -1 && errno == EINTR);
             if (r != c1) { onerr_abort++; ohshite(_("wait for shell failed")); }