diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-05-28 07:45:10 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-05-28 07:45:10 +0000 |
| commit | 0bce0d91ac7bc4997201ede1eb4af91cbeb65e22 (patch) | |
| tree | ffa7415b079e6dd0d9501473830587d0271a724b /rules/php5.in | |
| parent | 0aa8eb901f34b23377b2c34711b9a5826ed332d5 (diff) | |
| download | ptxdist-0bce0d91ac7bc4997201ede1eb4af91cbeb65e22.tar.gz ptxdist-0bce0d91ac7bc4997201ede1eb4af91cbeb65e22.tar.xz | |
[php5] cleanup installation of php.ini
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10582 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/php5.in')
| -rw-r--r-- | rules/php5.in | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/rules/php5.in b/rules/php5.in index 1458b642a..6861ad49e 100644 --- a/rules/php5.in +++ b/rules/php5.in @@ -13,6 +13,16 @@ menuconfig PHP5 if PHP5 +config PHP5_INI + bool + prompt "install /etc/php5/php.ini" + default y + help + Installs (if present) the + "./projectroot/etc/php5/php.ini" file from your + workspace, otherwise a generic one from the ptxdist + directory. + # ---------------------------------------------------------------------------- # SAPI Modules # ---------------------------------------------------------------------------- @@ -221,35 +231,6 @@ endmenu # General Settings # ---------------------------------------------------------------------------- -config ROOTFS_PHP5_INI - bool - prompt "/etc/php5/php.ini" - default y - help - Installs a /etc/php5/php.ini file from a selectable source. - -choice - prompt "Kind of /etc/php5/php.ini" - depends on ROOTFS_PHP5_INI - default ROOTFS_GENERIC_PHP5_INI - - config ROOTFS_GENERIC_PHP5_INI - bool - prompt "Use generic" - help - This uses the recommended generic configuration - file (php.ini-recommended) which is shipped with - source of PHP5. - - config ROOTFS_USER_PHP5_INI - bool - prompt "User defined" - help - This uses a user defined /etc/php5/php.ini. PTXdist - uses file projectroot/etc/php5/php.ini in your local - project. -endchoice - menuconfig PHP5_XML bool prompt "xml support " |