From: Guillem Jover Date: Thu, 11 Jan 2007 23:59:42 +0000 (+0000) Subject: Do not bail out in dpkg when building without start-stop-daemon support, X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0fc8b70c3512ca4bbba0d1b1f9d99da8fbe2d88;p=dpkg 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 dc7d2b7e..513d344c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-12 Mark Rosenstand + + * 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 Guillem Jover diff --git a/debian/changelog b/debian/changelog index e431ab27..12be04f0 100644 --- 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 fd811945..cacca11f 100644 --- 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