s6

commit adb57f45278de244686ba5f72d2700fecc302e12
parent f84f150acd91c3c1c74795155d8201f1f9285c74
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sat,  6 Dec 2014 00:18:32 +0000

fix: (EXT)BINPREFIX needs an ending /. Revert bad fix in s6lock.h and ftrigr.h

Diffstat:
M
configure
 | 
8
++++----
M
src/include/s6/ftrigr.h
 | 
2
+-
M
src/include/s6/s6lock.h
 | 
4
++--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
@@ -371,13 +371,13 @@ cat <<EOF
 #define ${package_macro_name}_VERSION "$version"
 EOF
 if $slashpackage ; then
-  echo "#define ${package_macro_name}_BINPREFIX \"$binprefix\""
-  echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix\""
-  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix\""
+  echo "#define ${package_macro_name}_BINPREFIX \"$binprefix/\""
+  echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\""
+  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix/\""
 else
   echo "#define ${package_macro_name}_BINPREFIX \"\""
   echo "#define ${package_macro_name}_EXTBINPREFIX \"\""
-  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir\""
+  echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\""
 fi
 echo
 echo "#endif"
diff --git a/src/include/s6/ftrigr.h b/src/include/s6/ftrigr.h
@@ -17,7 +17,7 @@
 
 #define FTRIGR_IPCPATH SKALIBS_SPROOT "/service/ftrigrd/s"
 
-#define FTRIGRD_PROG S6_BINPREFIX "/s6-ftrigrd"
+#define FTRIGRD_PROG S6_BINPREFIX "s6-ftrigrd"
 #define FTRIGR_BANNER1 "ftrigr v1.0 (b)\n"
 #define FTRIGR_BANNER1_LEN (sizeof FTRIGR_BANNER1 - 1)
 #define FTRIGR_BANNER2 "ftrigr v1.0 (a)\n"
diff --git a/src/include/s6/s6lock.h b/src/include/s6/s6lock.h
@@ -14,8 +14,8 @@
 
  /* Constants */
 
-#define S6LOCKD_PROG S6_BINPREFIX "/s6lockd"
-#define S6LOCKD_HELPER_PROG S6_BINPREFIX "/s6lockd-helper"
+#define S6LOCKD_PROG S6_BINPREFIX "s6lockd"
+#define S6LOCKD_HELPER_PROG S6_BINPREFIX "s6lockd-helper"
 
 #define S6LOCK_BANNER1 "s6lock v1.0 (b)\n"
 #define S6LOCK_BANNER1_LEN (sizeof S6LOCK_BANNER1 - 1)