diff options
| author | Jani Taskinen <jani@php.net> | 2009-12-15 11:17:47 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-12-15 11:17:47 +0000 |
| commit | 4e10081f8f6d3cbd02abf77c56ab823deb1fa46a (patch) | |
| tree | 62f478673d2c435e159a4442616d533860b6e063 | |
| parent | def4e7c0e688ce16cfe518ac131aef8f436b182d (diff) | |
| download | php-git-4e10081f8f6d3cbd02abf77c56ab823deb1fa46a.tar.gz | |
- Make $sbindir be usable in C code as well (like $bindir and co.)
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/build-defs.h.in | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 1918faeb96..09d3d1705a 100644 --- a/configure.in +++ b/configure.in @@ -1157,6 +1157,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 @@ -1172,6 +1173,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 fcc15e9f6a..a60da8d4d9 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@" |