From e9bc36522a276b462a558d4c4404ea53be2e9b93 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Mon, 18 Apr 2011 09:50:32 +0000 Subject: [PATCH] Expose PHP_MANDIR Useful for apps (like the pear installer, phd, .. etc) to install their manpages into the same dir as php did :] --- configure.in | 2 ++ main/build-defs.h.in | 1 + main/main.c | 1 + 3 files changed, 4 insertions(+) diff --git a/configure.in b/configure.in index 24aa13a004..b0c0c65654 100644 --- a/configure.in +++ b/configure.in @@ -1167,6 +1167,7 @@ EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` EXPANDED_BINDIR=`eval echo $bindir` EXPANDED_SBINDIR=`eval echo $sbindir` +EXPANDED_MANDIR=`eval echo $mandir` EXPANDED_LIBDIR=$libdir EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir @@ -1183,6 +1184,7 @@ AC_SUBST(EXPANDED_PEAR_INSTALLDIR) AC_SUBST(EXPANDED_EXTENSION_DIR) AC_SUBST(EXPANDED_BINDIR) AC_SUBST(EXPANDED_SBINDIR) +AC_SUBST(EXPANDED_MANDIR) 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 a60da8d4d9..aa1fbf0321 100644 --- a/main/build-defs.h.in +++ b/main/build-defs.h.in @@ -81,6 +81,7 @@ #define PHP_PREFIX "@prefix@" #define PHP_BINDIR "@EXPANDED_BINDIR@" #define PHP_SBINDIR "@EXPANDED_SBINDIR@" +#define PHP_MANDIR "@EXPANDED_MANDIR@" #define PHP_LIBDIR "@EXPANDED_LIBDIR@" #define PHP_DATADIR "@EXPANDED_DATADIR@" #define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@" diff --git a/main/main.c b/main/main.c index ef4c9e8a7c..6c910b3275 100644 --- a/main/main.c +++ b/main/main.c @@ -1979,6 +1979,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_MANDIR", PHP_MANDIR, sizeof(PHP_MANDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS); -- 2.40.0