From ecf958b057fcc0e0707419b3300bd43365c424b4 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 9 Sep 2014 15:06:05 +0000 Subject: [PATCH] Ubuntu only needs "-s ALL" and Debian gives an error, because it does not support it --- doc/rpm-build/post_install.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index 53dd8a48ac..1584e47f58 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -124,7 +124,10 @@ function set_distro_defaults($distro=null) // enable mcrypt if (file_exists('/usr/sbin/php5enmod')) { - $config['php5enmod'] = '/usr/sbin/php5enmod -s ALL mcrypt'; + $config['php5enmod'] = '/usr/sbin/php5enmod'; + // Ubuntu only needs "-s ALL" and Debian gives an error, because it does not support it + if (!file_exists('/etc/php5/conf.d/')) $config['php5enmod'] = ' -s ALL'; + $config['php5enmod'] = 'mcrypt'; } $config['autostart_db'] = '/usr/sbin/update-rc.d mysql defaults'; $config['autostart_webserver'] = '/usr/sbin/update-rc.d apache2 defaults';