Do not bail out in dpkg when building without start-stop-daemon support,

by checking if the macro value is true instead of it being defined.
Thanks to Mark Rosenstand.

diff --git a/ChangeLog b/ChangeLog
index dc7d2b7e65e2e7baa8ab26f0a0d414f02e85ec3d..513d344c027e636f7605dc2e4390546d2606284d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Mark Rosenstand  <mark@borkware.net>
+
+       * src/help.c (checkpath): Check for the value of the macro
+       WITH_START_STOP_DAEMON instead of it being defined.
+
 2007-01-11  Riku Voipio <riku.voipio@iki.fi>
            Guillem Jover <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index e431ab27df98b6aefc7ad880e0c286c6dc78ba4e..12be04f0490821025162f26fc417079611b13f70 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ dpkg (1.14.0) UNRELEASED; urgency=low
   * Move retrieval of uid and gid information from controllib.pl into a
     function, so that scripts not needing it do not execute that code.
     Based on a patch by Riku Voipio. Closes: #396884
+  * Do not bail out in dpkg when building without start-stop-daemon support,
+    by checking if the macro value is true instead of it being defined.
+    Thanks to Mark Rosenstand.
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor)

diff --git a/src/help.c b/src/help.c
index fd8119453065436ace2c87f2b8642b159f55fbea..cacca11f484a948998dced9b146c2455d9f4b073 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -70,7 +70,7 @@ struct filenamenode *namenodetouse(struct filenamenode *namenode, struct pkginfo
 void checkpath(void) {
 /* Verify that some programs can be found in the PATH. */
   static const char *const checklist[]= { "ldconfig", 
-#ifdef WITH_START_STOP_DAEMON
+#if WITH_START_STOP_DAEMON
     "start-stop-daemon",
 #endif    
     "install-info", "update-rc.d", 0