Quellcode durchsuchen

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.

Guillem Jover vor 19 Jahren
Ursprung
Commit
c0fc8b70c3
3 geänderte Dateien mit 9 neuen und 1 gelöschten Zeilen
  1. 5 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 1
      src/help.c

+ 5 - 0
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>
 2007-01-11  Riku Voipio <riku.voipio@iki.fi>
 	    Guillem Jover <guillem@debian.org>
 	    Guillem Jover <guillem@debian.org>
 
 

+ 3 - 0
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
   * Move retrieval of uid and gid information from controllib.pl into a
     function, so that scripts not needing it do not execute that code.
     function, so that scripts not needing it do not execute that code.
     Based on a patch by Riku Voipio. Closes: #396884
     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 ]
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor)
   * Romanian (Eddy Petrișor)

+ 1 - 1
src/help.c

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