- Make $sbindir be usable in C code as well (like $bindir and co.)

diff --git a/configure.in b/configure.in
index 882bc532f8f902feab2fae52e95d2e3b64496c58..2cf7c7b4e39f593633e95664f35cf1b789315821 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1096,6 +1096,7 @@ dnl Expand all directory names for use in macros/constants
 EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
 EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
 EXPANDED_BINDIR=`eval echo $bindir`
+EXPANDED_SBINDIR=`eval echo $sbindir`
 EXPANDED_LIBDIR=$libdir
 EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
 EXPANDED_DATADIR=$datadir
@@ -1110,6 +1111,7 @@ datadir=$old_datadir
 AC_SUBST(INCLUDE_PATH)
 AC_SUBST(EXPANDED_EXTENSION_DIR)
 AC_SUBST(EXPANDED_BINDIR)
+AC_SUBST(EXPANDED_SBINDIR)
 AC_SUBST(EXPANDED_LIBDIR)
 AC_SUBST(EXPANDED_DATADIR)
 AC_SUBST(EXPANDED_SYSCONFDIR)

diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index 41bba0d83590c9b5c2f01e6933464c530ed6338d..64063c648767182a36bbc4d46f8a7901718072d1 100644 (file)
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -79,6 +79,7 @@
 #define PHP_EXTENSION_DIR       "@EXPANDED_EXTENSION_DIR@"
 #define PHP_PREFIX              "@prefix@"
 #define PHP_BINDIR              "@EXPANDED_BINDIR@"
+#define PHP_SBINDIR             "@EXPANDED_SBINDIR@"
 #define PHP_LIBDIR              "@EXPANDED_LIBDIR@"
 #define PHP_DATADIR             "@EXPANDED_DATADIR@"
 #define PHP_SYSCONFDIR          "@EXPANDED_SYSCONFDIR@"