diff options
| author | Jeremy Davis <jeremyd@freeside.biz> | 2015-05-26 13:40:39 -0400 |
|---|---|---|
| committer | Jeremy Davis <jeremyd@freeside.biz> | 2015-05-26 13:40:39 -0400 |
| commit | 1da8bc3a1229d6e8fae3fde5ad70b297176c285b (patch) | |
| tree | eabe053d8c57d082e36052bc8ab805f5379903df /debian/rules | |
| parent | 88e71e16110306c7a8d5900aecd05e932c9dbfae (diff) | |
Debian package changes
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules index 85f6a6147..e82254e18 100755 --- a/debian/rules +++ b/debian/rules @@ -46,14 +46,13 @@ export DIST_CONF = ${FREESIDE_CONF}/default_conf #export MASON_HANDLER = /usr/share/freeside/handler.pl export MASON_HANDLER=$(TMP)-webui/usr/local/etc/freeside/handler.pl -#export FREESIDE_DOCUMENT_ROOT = /usr/share/freeside/www -export APACHE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www') +export APACHE_VERSION := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2') +export APACHE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www') export FREESIDE_DOCUMENT_ROOT = $(TMP)$(APACHE_DOCUMENT_ROOT)/freeside export INIT_FILE = $(TMP).init export INIT_INSTALL = /bin/true export HTTPD_RESTART = /bin/true -#export APACHE_CONF = /etc/apache2/conf.d -export APACHE_CONF = $(TMP)-webui/etc/freeside/apache2 +export APACHE_CONF := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-webui/etc/apache2/conf-available" || echo "$(TMP)-webui/etc/apache2/conf.d") export FREESIDE_RESTART = /bin/true #XXX root? |