From 6c0b2a3a0e40bd6aaa57827b420e2996f5440423 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Tue, 15 Dec 2009 11:17:47 +0000 Subject: [PATCH] - Make $sbindir be usable in C code as well (like $bindir and co.) --- configure.in | 2 ++ main/build-defs.h.in | 1 + 2 files changed, 3 insertions(+) diff --git a/configure.in b/configure.in index fd4695a884..b65752bbc1 100644 --- a/configure.in +++ b/configure.in @@ -1141,6 +1141,7 @@ EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR` 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 @@ -1156,6 +1157,7 @@ AC_SUBST(INCLUDE_PATH) AC_SUBST(EXPANDED_PEAR_INSTALLDIR) 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 9aa923d040..93e325692b 100644 --- a/main/build-defs.h.in +++ b/main/build-defs.h.in @@ -80,6 +80,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@" -- 2.50.1