Browse Source

* removed PHP.conf because now everything is autodetected

* changed pkg_conf/php.conf to use apache prefix only if apache is installed
legacy/multilib
Alejandro Mery 19 years ago
parent
commit
661c4f3008
2 changed files with 14 additions and 36 deletions
  1. +14
    -11
      pkg_conf/php.conf
  2. +0
    -25
      pkgsel/Services/Web/PHP.conf

+ 14
- 11
pkg_conf/php.conf

@ -12,16 +12,19 @@
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
prefix_auto=0
prefix='opt/apache'
set_confopt
hook_add postmake 5 'mnemosyne_php_addconf'
mnemosyne_php_addconf() {
mkdir -p $sysconfdir/conf.d
cat <<-EOT > $sysconfdir/conf.d/php.conf
LoadModule php5_module modules/libphp5.so
if [ "$SDECFG_TRG_MNEMOSYNE_WEB" = apache ]; then
prefix_auto=0
prefix='opt/apache'
set_confopt
AddHandler application/x-httpd-php .php
EOT
}
hook_add postmake 5 'mnemosyne_php_addconf'
mnemosyne_php_addconf() {
mkdir -p $sysconfdir/conf.d
cat <<-EOT > $sysconfdir/conf.d/php.conf
LoadModule php5_module modules/libphp5.so
AddHandler application/x-httpd-php .php
EOT
}
fi

+ 0
- 25
pkgsel/Services/Web/PHP.conf

@ -1,25 +0,0 @@
#!/bin/sh
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: target/mnemosyne/pkgsel/Services/Web/PHP.conf
# Copyright (C) 2004 - 2005 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
for xpkg in postgresql openldap openssl ; do
if pkgcheck $xpkg X ; then
eval SDECFGSET_PKG_PHP_$xpkg=1
fi
done
for xpkg in mcrypt mhash gd ; do
if pkgcheck lib$xpkg X ; then
eval SDECFGSET_PKG_PHP_$xpkg=1
fi
done

Loading…
Cancel
Save